mirror of https://github.com/acanas/swad-core.git
Version19.110
This commit is contained in:
parent
4e298539cf
commit
c0cb7c613f
|
@ -27,6 +27,8 @@
|
||||||
/********************************* Headers ***********************************/
|
/********************************* Headers ***********************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
#include <stdbool.h> // For boolean type
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -330,61 +330,35 @@ static bool CtrCfg_GetIfMapIsAvailable (void)
|
||||||
/****************************** Draw centre map ******************************/
|
/****************************** Draw centre map ******************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
#define CtrCfg_MAP_CONTAINER_ID "centre_mapid"
|
||||||
|
|
||||||
static void CtrCfg_Map (void)
|
static void CtrCfg_Map (void)
|
||||||
{
|
{
|
||||||
/* https://leafletjs.com/examples/quick-start/ */
|
|
||||||
/***** Leaflet CSS *****/
|
/***** Leaflet CSS *****/
|
||||||
HTM_Txt ("<link rel=\"stylesheet\""
|
Map_LeafletCSS ();
|
||||||
" href=\"https://unpkg.com/leaflet@1.6.0/dist/leaflet.css\""
|
|
||||||
" integrity=\"sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ==\""
|
|
||||||
" crossorigin=\"\" />");
|
|
||||||
|
|
||||||
/***** Leaflet script *****/
|
/***** Leaflet script *****/
|
||||||
/* Put this AFTER Leaflet's CSS */
|
Map_LeafletScript ();
|
||||||
HTM_Txt ("<script src=\"https://unpkg.com/leaflet@1.6.0/dist/leaflet.js\""
|
|
||||||
" integrity=\"sha512-gZwIG9x3wUXg2hdXF6+rVkLF/0Vi9U8D2Ntg4Ga5I5BZpVkVxlJWbSQtXPSiUTtC0TjtGOmxa1AJPuV0CPthew==\""
|
|
||||||
" crossorigin=\"\">"
|
|
||||||
"</script>");
|
|
||||||
|
|
||||||
/***** Container for the map *****/
|
/***** Container for the map *****/
|
||||||
HTM_DIV_Begin ("id=\"centre_mapid\"");
|
HTM_DIV_Begin ("id=\"%s\"",CtrCfg_MAP_CONTAINER_ID);
|
||||||
HTM_DIV_End ();
|
HTM_DIV_End ();
|
||||||
|
|
||||||
/***** Script to draw the map *****/
|
/***** Script to draw the map *****/
|
||||||
HTM_SCRIPT_Begin (NULL,NULL);
|
HTM_SCRIPT_Begin (NULL,NULL);
|
||||||
Str_SetDecimalPointToUS (); // To write the decimal point as a dot
|
|
||||||
|
|
||||||
/* Let's create a map of the center of London with pretty Mapbox Streets tiles */
|
/* Let's create a map of the center of London with pretty Mapbox Streets tiles */
|
||||||
HTM_TxtF ("\tvar mymap = L.map('centre_mapid').setView([%lg, %lg], 16);\n",
|
Map_CreateMap (CtrCfg_MAP_CONTAINER_ID,&Gbl.Hierarchy.Ctr.Coord);
|
||||||
Gbl.Hierarchy.Ctr.Coord.Latitude,
|
|
||||||
Gbl.Hierarchy.Ctr.Coord.Longitude);
|
|
||||||
|
|
||||||
/* Next we'll add a tile layer to add to our map,
|
/* Add Mapbox Streets tile layer to our map */
|
||||||
in this case it's a Mapbox Streets tile layer.
|
Map_AddTileLayer ();
|
||||||
Creating a tile layer usually involves
|
|
||||||
setting the URL template for the tile images,
|
|
||||||
the attribution text and the maximum zoom level of the layer.
|
|
||||||
In this example we'll use the mapbox/streets-v11 tiles
|
|
||||||
from Mapbox's Static Tiles API
|
|
||||||
(in order to use tiles from Mapbox,
|
|
||||||
you must also request an access token).*/
|
|
||||||
HTM_Txt ("\tL.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token={accessToken}', {"
|
|
||||||
"attribution: 'Map data © <a href=\"https://www.openstreetmap.org/\">OpenStreetMap</a> contributors, <a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>, Imagery © <a href=\"https://www.mapbox.com/\">Mapbox</a>',"
|
|
||||||
"maxZoom: 20,"
|
|
||||||
"id: 'mapbox/streets-v11',"
|
|
||||||
"accessToken: 'pk.eyJ1IjoiYWNhbmFzIiwiYSI6ImNrNGFoNXFxOTAzdHozcnA4d3Y0M3BwOGkifQ.uSg754Lv2iZEJg0W2pjiOQ'"
|
|
||||||
"}).addTo(mymap);\n");
|
|
||||||
|
|
||||||
/* Marker */
|
/* Add marker */
|
||||||
HTM_TxtF ("\tvar marker = L.marker([%lg, %lg]).addTo(mymap);",
|
Map_AddMarker (&Gbl.Hierarchy.Ctr.Coord);
|
||||||
Gbl.Hierarchy.Ctr.Coord.Latitude,
|
|
||||||
Gbl.Hierarchy.Ctr.Coord.Longitude);
|
|
||||||
|
|
||||||
HTM_TxtF ("\tmarker.bindPopup(\"<strong>%s</strong><br />%s\").openPopup();",
|
/* Add popup */
|
||||||
Gbl.Hierarchy.Ctr.ShrtName,
|
Map_AddPopup (Gbl.Hierarchy.Ctr.ShrtName,Gbl.Hierarchy.Ins.ShrtName);
|
||||||
Gbl.Hierarchy.Ins.ShrtName);
|
|
||||||
|
|
||||||
Str_SetDecimalPointToLocal (); // Return to local system
|
|
||||||
HTM_SCRIPT_End ();
|
HTM_SCRIPT_End ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -492,7 +492,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
|
||||||
En OpenSWAD:
|
En OpenSWAD:
|
||||||
ps2pdf source.ps destination.pdf
|
ps2pdf source.ps destination.pdf
|
||||||
*/
|
*/
|
||||||
#define Log_PLATFORM_VERSION "SWAD 19.109.9 (2020-01-03)"
|
#define Log_PLATFORM_VERSION "SWAD 19.110 (2020-01-03)"
|
||||||
#define CSS_FILE "swad19.101.5.css"
|
#define CSS_FILE "swad19.101.5.css"
|
||||||
#define JS_FILE "swad19.91.1.js"
|
#define JS_FILE "swad19.91.1.js"
|
||||||
/*
|
/*
|
||||||
|
@ -502,6 +502,7 @@ ps2pdf source.ps destination.pdf
|
||||||
// TODO: Version 19.1xx: Jan xx, 2020 Map in country information. (? lines)
|
// TODO: Version 19.1xx: Jan xx, 2020 Map in country information. (? lines)
|
||||||
// TODO: Version 19.1xx: Jan xx, 2020 Map in institution information. (? lines)
|
// TODO: Version 19.1xx: Jan xx, 2020 Map in institution information. (? lines)
|
||||||
|
|
||||||
|
Version 19.110: Jan 03, 2020 Code refactoring in maps. (278160 lines)
|
||||||
Version 19.109.9: Jan 03, 2020 Removed unused actions. (278046 lines)
|
Version 19.109.9: Jan 03, 2020 Removed unused actions. (278046 lines)
|
||||||
Version 19.109.8: Jan 03, 2020 Changing action descriptions from database to swad-core. Not finished. (278185 lines)
|
Version 19.109.8: Jan 03, 2020 Changing action descriptions from database to swad-core. Not finished. (278185 lines)
|
||||||
Version 19.109.7: Jan 02, 2020 Changing action descriptions from database to swad-core. Not finished. (278368 lines)
|
Version 19.109.7: Jan 02, 2020 Changing action descriptions from database to swad-core. Not finished. (278368 lines)
|
||||||
|
|
163
swad_map.c
163
swad_map.c
|
@ -1 +1,162 @@
|
||||||
// swad_map.c: maps
|
// swad_map.c: OpenStreetMap maps
|
||||||
|
|
||||||
|
/*
|
||||||
|
SWAD (Shared Workspace At a Distance),
|
||||||
|
is a web platform developed at the University of Granada (Spain),
|
||||||
|
and used to support university teaching.
|
||||||
|
|
||||||
|
This file is part of SWAD core.
|
||||||
|
Copyright (C) 1999-2020 Antonio Cañas Vargas
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as
|
||||||
|
published by the Free Software Foundation, either version 3 of the
|
||||||
|
License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
/*****************************************************************************/
|
||||||
|
/********************************* Headers ***********************************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
// #define _GNU_SOURCE // For asprintf
|
||||||
|
// #include <stdbool.h> // For boolean type
|
||||||
|
// #include <stddef.h> // For NULL
|
||||||
|
// #include <stdio.h> // For asprintf
|
||||||
|
// #include <string.h> // For string functions
|
||||||
|
// #include <unistd.h> // For unlink
|
||||||
|
|
||||||
|
// #include "swad_global.h"
|
||||||
|
#include "swad_HTML.h"
|
||||||
|
#include "swad_map.h"
|
||||||
|
#include "swad_string.h"
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/************** External global variables from others modules ****************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
// extern struct Globals Gbl;
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/***************************** Private constants *****************************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/******************************* Private types *******************************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/***************************** Private variables *****************************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/***************************** Private prototypes ****************************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
/* https://leafletjs.com/examples/quick-start/ */
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/******************************* Leaflet CSS ******************************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
void Map_LeafletCSS (void)
|
||||||
|
{
|
||||||
|
HTM_Txt ("<link rel=\"stylesheet\""
|
||||||
|
" href=\"https://unpkg.com/leaflet@1.6.0/dist/leaflet.css\""
|
||||||
|
" integrity=\"sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ==\""
|
||||||
|
" crossorigin=\"\" />");
|
||||||
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/******************************* Leaflet script ******************************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
void Map_LeafletScript (void)
|
||||||
|
{
|
||||||
|
/* Put this AFTER Leaflet's CSS */
|
||||||
|
HTM_Txt ("<script src=\"https://unpkg.com/leaflet@1.6.0/dist/leaflet.js\""
|
||||||
|
" integrity=\"sha512-gZwIG9x3wUXg2hdXF6+rVkLF/0Vi9U8D2Ntg4Ga5I5BZpVkVxlJWbSQtXPSiUTtC0TjtGOmxa1AJPuV0CPthew==\""
|
||||||
|
" crossorigin=\"\">"
|
||||||
|
"</script>");
|
||||||
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/************** Create a map centered in the given coordinates ***************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
void Map_CreateMap (const char *ContainerId,const struct Coordinates *Coord)
|
||||||
|
{
|
||||||
|
/* Let's create a map with pretty Mapbox Streets tiles */
|
||||||
|
Str_SetDecimalPointToUS (); // To write the decimal point as a dot
|
||||||
|
HTM_TxtF ("\t"
|
||||||
|
"var mymap = L.map('%s').setView([%lg, %lg], 16);\n",
|
||||||
|
ContainerId,Coord->Latitude,Coord->Longitude);
|
||||||
|
Str_SetDecimalPointToLocal (); // Return to local system
|
||||||
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/************************* Add tile layer to our map *************************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
#define Map_MAX_ZOOM 20
|
||||||
|
#define Map_MAPBOX_ACCESS_TOKEN "pk.eyJ1IjoiYWNhbmFzIiwiYSI6ImNrNGFoNXFxOTAzdHozcnA4d3Y0M3BwOGkifQ.uSg754Lv2iZEJg0W2pjiOQ"
|
||||||
|
|
||||||
|
void Map_AddTileLayer (void)
|
||||||
|
{
|
||||||
|
/* Next we'll add a tile layer to add to our map,
|
||||||
|
in this case it's a Mapbox Streets tile layer.
|
||||||
|
Creating a tile layer usually involves
|
||||||
|
setting the URL template for the tile images,
|
||||||
|
the attribution text and the maximum zoom level of the layer.
|
||||||
|
In this example we'll use the mapbox/streets-v11 tiles
|
||||||
|
from Mapbox's Static Tiles API
|
||||||
|
(in order to use tiles from Mapbox,
|
||||||
|
you must also request an access token).*/
|
||||||
|
HTM_TxtF ("\t"
|
||||||
|
"L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token={accessToken}',"
|
||||||
|
" {"
|
||||||
|
"attribution:"
|
||||||
|
" 'Map data © <a href=\"https://www.openstreetmap.org/\">OpenStreetMap</a> contributors,"
|
||||||
|
" <a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>,"
|
||||||
|
" Imagery © <a href=\"https://www.mapbox.com/\">Mapbox</a>',"
|
||||||
|
"maxZoom: %u,"
|
||||||
|
"id: 'mapbox/streets-v11',"
|
||||||
|
"accessToken: '%s'"
|
||||||
|
"}).addTo(mymap);\n",
|
||||||
|
Map_MAX_ZOOM,
|
||||||
|
Map_MAPBOX_ACCESS_TOKEN);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/************************** Add a marker to our map **************************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
void Map_AddMarker (const struct Coordinates *Coord)
|
||||||
|
{
|
||||||
|
Str_SetDecimalPointToUS (); // To write the decimal point as a dot
|
||||||
|
HTM_TxtF ("\t"
|
||||||
|
"var marker = L.marker([%lg, %lg]).addTo(mymap);\n",
|
||||||
|
Coord->Latitude,Coord->Longitude);
|
||||||
|
Str_SetDecimalPointToLocal (); // Return to local system
|
||||||
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/************************** Add a marker to our map **************************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
void Map_AddPopup (const char *Title,const char *Subtitle)
|
||||||
|
{
|
||||||
|
/* The bindPopup method attaches a popup with the specified HTML content
|
||||||
|
to your marker so the popup appears when you click on the object,
|
||||||
|
and the openPopup method (for markers only) immediately opens the attached popup. */
|
||||||
|
|
||||||
|
HTM_TxtF ("\t"
|
||||||
|
"marker.bindPopup(\"<strong>%s</strong><br />%s\").openPopup();\n",
|
||||||
|
Title,Subtitle);
|
||||||
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// swad_map.h: maps
|
// swad_map.h: OpenStreetMap maps
|
||||||
|
|
||||||
#ifndef _SWAD_MAP
|
#ifndef _SWAD_MAP
|
||||||
#define _SWAD_MAP
|
#define _SWAD_MAP
|
||||||
|
@ -42,4 +42,11 @@ struct Coordinates
|
||||||
/****************************** Public prototypes ****************************/
|
/****************************** Public prototypes ****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
void Map_LeafletCSS (void);
|
||||||
|
void Map_LeafletScript (void);
|
||||||
|
void Map_CreateMap (const char *ContainerId,const struct Coordinates *Coord);
|
||||||
|
void Map_AddTileLayer (void);
|
||||||
|
void Map_AddMarker (const struct Coordinates *Coord);
|
||||||
|
void Map_AddPopup (const char *Title,const char *Subtitle);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue