[guadec-web: 9/10] more icons and fixed picture on popup
- From: Oliver Gutiérrez <ogutierrez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [guadec-web: 9/10] more icons and fixed picture on popup
- Date: Wed, 27 Jun 2018 10:58:52 +0000 (UTC)
commit 75f9aac4d382f3f830eb23d6a3d8320389241a92
Author: Jorge Sanz <xurxosanz gmail com>
Date: Wed Jun 27 11:00:41 2018 +0200
more icons and fixed picture on popup
content/pages/map.md | 269 +---------------------
src/js/guadec_map/guadec-map.js | 4 +-
src/js/guadec_map/maki-guadec-svg/bank-45.svg | 48 ++++
src/js/guadec_map/maki-guadec-svg/karaoke-45.svg | 55 +++++
src/js/guadec_map/maki-guadec-svg/lodging-45.svg | 48 ++++
src/js/guadec_map/maki-guadec-svg/marker-45.svg | 48 ++++
src/js/guadec_map/maki-guadec-svg/suitcase-45.svg | 49 ++++
src/js/guadec_map/maki-guadec-svg/village-45.svg | 48 ++++
src/js/guadec_map/sprite.json | 100 +++++---
src/js/guadec_map/sprite.png | Bin 13977 -> 16588 bytes
src/js/guadec_map/sprite 2x json | 100 +++++---
src/js/guadec_map/sprite 2x png | Bin 31098 -> 37353 bytes
12 files changed, 450 insertions(+), 319 deletions(-)
---
diff --git a/content/pages/map.md b/content/pages/map.md
index ba13d62..f599349 100644
--- a/content/pages/map.md
+++ b/content/pages/map.md
@@ -75,28 +75,29 @@ Date: 20180615
/* parameters */
var options = {/* List of ways to include in the map */
osm_ways : [
- { osm_id: 27152910, name: 'railway station', icon: 'rail-45'}, // almeria railway
+ { osm_id: 27152910, name: 'Railway Station', icon: 'rail-45'}, // almeria railway
27152911, // Estación intermodal
{ osm_id: 29220363, icon: 'gnome-guadec-red'}, // almeria university
- 435775764, // Civitas
- 37923960, // airport
- { osm_id: 36406179, name: 'UAL Parking'}, // UAL parking
+ { osm_id: 435775764, icon: 'lodging-45'}, // Civitas
+ { osm_id:37923960, icon: 'airport-45'}, // airport
+ { osm_id: 36406179, name: 'UAL Parking', icon: 'parking-45'}, // UAL parking
{ osm_id: 509640566, name: 'Patio de los naranjos'}, // Patio de los naranjos
187403583, // terraza del mar
- { osm_id: 27155530, name: 'Alcazaba meeting point'},
+ { osm_id: 27155530, name: 'Alcazaba meeting point', icon: 'marker-45'},
{ osm_id: 27018547, name: 'Alcazaba de Almería', icon: 'gnome-guadec-yellow'},
- { osm_id: 37639082, name: 'Auditorium'},
+ { osm_id: 37639082, name: 'Auditorium', icon: 'theatre-45'},
{ osm_id: 37639116, name: 'Conference Room'},
- { osm_id: 37639300, name: 'University cafeteria'},
+ { osm_id: 37639300, name: 'University cafeteria', icon:'cafe-45'},
],
/* List of nodes to include in the map */
osm_nodes : [
+ 4414057566, // la mala
{ osm_id: 2870058034, name: 'Intermodal bus stop',icon: 'bus-45'}, // 292
{ osm_id: 974730957, icon: 'bus-45'}, // 144
{ osm_id: 469474242, icon: 'bus-45'}, // 71
{ osm_id: 469474241, icon: 'bus-45'}, //56
{ osm_id: 1304074112, name: 'Airport bus stop',icon: 'bus-45'}, // 188
- { osm_id: 999522025, name: 'ATM'}, // ATM machine
+ { osm_id: 999522025, name: 'ATM', icon: 'bank-45'}, // ATM machine
],
/* list of routes to render */
routes : [
@@ -128,248 +129,6 @@ Date: 20180615
'adr:street', 'picture',
'website','wikidata','wikipedia'
]
-<<<<<<< HEAD
-=======
- ;
-</script>
-
-<script>
- /* Functions and helpers */
- var overpass_url = 'https://overpass-api.de/api/interpreter',
- /* from https://www.npmjs.com/package/geojson-polygon-center */
- polygon_center = function (polygon) {
- var minx = miny = 1000,
- maxx = maxy = -1000
- polygon = polygon[0]
- for (var i = 0; i < polygon.length; i++) {
- var point = polygon[i]
- var x = point[0]
- var y = point[1]
-
- if (x < minx) minx = x
- else if (x > maxx) maxx = x
- if (y < miny) miny = y
- else if (y > maxy) maxy = y
- }
-
- return {
- type: 'Point',
- coordinates: [
- minx + ((maxx - minx) / 2),
- miny + ((maxy - miny) / 2)
- ]
- }
- },
- /* helper to get the list of ids */
- get_ids = function(el){
- return typeof el == "number" ? el : el['osm_id'];
- },
- /* takes a feature, and augment it with any custom properties
- passed on thi list of nodes and ways */
- get_props = function(feature){
- var /* filter checker */
- filter_node = function(node){
- return typeof node != "number" && node['osm_id'] == feat_id;
- },
- properties = feature['properties'],
- /* feature id */
- feat_id = properties['id'],
- /* candidates */
- candidate = osm_nodes.filter(filter_node)
- .concat(osm_ways.filter(filter_node));
-
- if (candidate.length == 1){
- properties = Object.assign(properties,candidate[0]);
- };
-
- return feature;
- },
- /* Generate a valid OSM Overpass API request */
- get_osm_query = function(){
- var ways = osm_ways.map(get_ids).join(',');
- var nodes = osm_nodes.map(get_ids).join(',');
-
- return `[out:xml][timeout:300];
- (
- way(id:${ways});
- node(id:${nodes});
- )->.a;
- (.a; .a >;);out qt;`
- }
- /* moves tags up to the main properties function */
- tags_to_props = function(feature){
- properties = feature['properties']
- tags = properties['tags'];
- Object.assign(properties, tags);
- delete properties['tags'];
-
- if (properties['id'] == undefined){
- properties['id'] = String(feature['id'])
- } else {
- properties['id'] = String(properties['id'])
- };
-
- // Override the name in Engish, if it exists
- if (properties['name:en'] != undefined){
- properties['name'] = properties['name:en']
- };
-
- return feature
- },
- /* transforms OSM data into geojson and adds that as
- points and labels to the map */
- load_osm_data = function(data){
- console.log('loading data...');
- var // Convert to GeoJSON
- geojson_data = osmtogeojson(data),
- // Filter ways
- polys_geojson = geojson_data.features.filter(function(feature){
- return feature.properties.type == "way"
- }),
- // Filter points
- points_geojson = geojson_data.features.filter(function(feature){
- return feature.properties.type == "node"
- }),
- // Generate centroids for points
- polys_geojson_points = polys_geojson.map(function(poly){
- copy = JSON.parse(JSON.stringify(poly));
- copy['geometry'] = polygon_center(copy.geometry.coordinates);
- return copy
- }),
- // Get together both set of points
- all_features = points_geojson.concat(polys_geojson_points),
- // Get all properties out from the tags
- points_geojson_props = all_features.map(tags_to_props),
- // Override any custom properties
- final_points = points_geojson_props.map(get_props);
-
- // Build final geojson collection
- return {
- 'type': 'FeatureCollection',
- 'features': final_points
- };
- },
- /* Loads the data retrieved into a mapboxgl map */
- add_layers = function(map, data){
- map.loadImage(icon, function(error, image) {
- if (error) throw error;
- map.addImage('gnome', image);
-
- /* Icon layer */
- map.addLayer({
- 'id': 'guadec_icon',
- 'type': 'symbol',
- 'source': {
- 'type': 'geojson',
- 'data': geojson_data
- },
- 'layout': {
- "symbol-placement": "point",
- "text-field": '{name}' ,
- "icon-image": "gnome",
- "text-font": ["Open Sans Regular"],
- "icon-allow-overlap": true,
- "text-offset": [.3,.3],
- "text-anchor": "top-left",
- "text-max-width": 5,
- "text-justify": "left",
- "text-allow-overlap": false,
- "text-optional": true,
- "icon-size": {
- "stops": [
- [0, 0.10],
- [12, 0.12],
- [14, 0.15],
- [18, 0.25]
- ]
- },
- "text-size": {
- "stops": [
- [0, 0],
- [9,0],
- [12, 15],
- [16, 20]
- ]
- }
- },
- 'paint': {
- "text-color": main_color,
- "icon-opacity": 1,
- "text-opacity": {
- "stops": [
- [0, 0],
- [9,0],
- [12, 1]
- ]
- },
- "text-halo-color": "white",
- "text-halo-width": 1.5,
- "text-halo-blur": 1
- }
- },'place_hamlet');
- });
- };
-</script>
-
-<script>
- /* SCRIPT */
- var geojson_data = {},
- map = new mapboxgl.Map({
- container: 'map',
- style: basemap_style,
- center: center,
- zoom: zoom,
- attributionControl: true
- });
-
- /*Once map is loaded, get data from OSM to add as a new layer */
- map.on('load', function() {
- console.log('fetching osm data...')
- fetch(overpass_url,{
- method: "POST",
- body: get_osm_query()})
- .then(response => response.text())
- .then(str => (new window.DOMParser()).parseFromString(str, "text/xml"))
- .then(function(data){
- // Get the geojson to work
- geojson_data = load_osm_data(data);
- console.log(geojson_data);
- // Add it as a layer
- add_layers(map,geojson_data);
- })
- .catch(error => console.log("Error:", error));
- });
-
- /* Navigation control */
- map.addControl(new mapboxgl.NavigationControl());
-
- /* Popup up singleton */
- var tooltip = new mapboxgl.Popup({
- closeButton: false,
- closeOnClick: true,
- anchor: "top",
- offset: [0, 8]
- });
-
- // helper to render the properties
- var get_properties_list = function(properties){
- return popup_properties.filter(function(key){
- return (Object.keys(properties).findIndex(x => x == key) > -1)
- })
- .map(function(key){
- if (key == 'website'){
- return `<li><a href="${properties[key]}">${key}</a></li>`
- } else if (key == 'wikidata'){
- return `<li><a href="https://www.wikidata.org/wiki/${properties[key]}";>${key}</a></li>`
- } else if (key == 'wikipedia'){
- return `<li><a href="https://en.wikipedia.org/wiki/${properties[key]}";>${key}</a></li>`
- } else if (key == 'picture'){
- return `<li><a href="${properties[key]}">${key}</a></li>`
- } else {
- return `<li><strong>${key}</strong>: ${properties[key]}</li>`
- }
- }).join('')
->>>>>>> master
};
(async function() {
@@ -409,14 +168,4 @@ Date: 20180615
})
})();
-
-
-<<<<<<< HEAD
-</script>
-=======
- // Set the filter of the layer to match those ids
- map.setFilter('guadec_icon', ['match', ['get', 'id'], ids, true, false]);
- }
- });
</script>
->>>>>>> master
diff --git a/src/js/guadec_map/guadec-map.js b/src/js/guadec_map/guadec-map.js
index f444e45..754a519 100644
--- a/src/js/guadec_map/guadec-map.js
+++ b/src/js/guadec_map/guadec-map.js
@@ -170,6 +170,8 @@ class GuadecMap {
return `<li><a href="https://www.wikidata.org/wiki/${properties[key]}";>${key}</a></li>`
} else if (key == 'wikipedia'){
return `<li><a href="https://en.wikipedia.org/wiki/${properties[key]}";>${key}</a></li>`
+ } else if (key == 'picture') {
+ return `<li><a href="${properties[key]}">Picture</a></li>`
} else {
return `<li><strong>${key}</strong>: ${properties[key]}</li>`
}
@@ -295,7 +297,7 @@ class GuadecMap {
]
},
"text-halo-color": "white",
- "text-halo-width": 1.5,
+ "text-halo-width": 2,
"text-halo-blur": 1
}
},'place_hamlet');
diff --git a/src/js/guadec_map/maki-guadec-svg/bank-45.svg b/src/js/guadec_map/maki-guadec-svg/bank-45.svg
new file mode 100644
index 0000000..8aa9296
--- /dev/null
+++ b/src/js/guadec_map/maki-guadec-svg/bank-45.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.1"
+ id="svg4619"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+ sodipodi:docname="bank-45.svg"
+ x="0px"
+ y="0px"
+ width="45"
+ height="45"
+ viewBox="0 0 45 45"
+ xml:space="preserve"><metadata
+ id="metadata8"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs6" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1916"
+ inkscape:window-height="1153"
+ id="namedview4"
+ showgrid="false"
+ inkscape:zoom="5.6686394"
+ inkscape:cx="-29.87399"
+ inkscape:cy="14.663949"
+ inkscape:window-x="0"
+ inkscape:window-y="45"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg4619" /><path
+ inkscape:connector-curvature="0"
+ id="rect5668"
+ d="m 3.9982959,9.6911273 c -1.5769145,0 -2.846416,1.2695017 -2.846416,2.8464157 v 19.924914 c
0,1.576914 1.2695015,2.846416 2.846416,2.846416 H 41.001704 c 1.576915,0 2.846416,-1.269502
2.846416,-2.846416 V 12.537543 c 0,-1.576914 -1.269501,-2.8464157 -2.846416,-2.8464157 z m 0,2.8464157 h
4.269624 c 0.7858954,0 1.4232079,0.637313 1.4232079,1.423208 0,0.785896 -0.6373125,1.423209
-1.4232079,1.423209 -0.7858955,0 -1.423208,-0.637313 -1.423208,-1.423209 l -1.423208,1.423209 c 0.7858954,0
1.423208,0.637312 1.423208,1.423208 0,0.785895 -0.6373126,1.423208 -1.423208,1.423208 -0.7858955,0
-1.423208,-0.637313 -1.423208,-1.423208 z m 18.5017031,0 c 3.930048,0 7.116042,4.460334 7.116042,9.962457 v 0
c 0,5.502123 -3.185994,9.962457 -7.116042,9.962457 -3.930046,0 -7.116039,-4.460334 -7.116039,-9.962457
0,-5.502123 3.185993,-9.962457 7.116039,-9.962457 z m 14.232082,0 h 4.269623 v 4.269625 c 0,0.785895
-0.637312,1.423208 -1.423207,1.423208 -0.785896,0 -1.423208,-0.637313 -1.423208,
-1.42320
8 0,-0.785896 0.637312,-1.423208 1.423208,-1.423208 l -1.423208,-1.423209 c 0,0.785896 -0.637313,1.423209
-1.423208,1.423209 -0.785896,0 -1.423208,-0.637313 -1.423208,-1.423209 0,-0.785895 0.637312,-1.423208
1.423208,-1.423208 z m -14.232082,4.269625 c -0.919392,0 -1.518847,0.30969 -1.940117,0.711604 h 3.880519 c
-0.421554,-0.401914 -1.021009,-0.711604 -1.940402,-0.711604 z m -2.490614,1.423208 c -0.129511,0.259023
-0.175623,0.487021 -0.227997,0.711604 h 5.437223 c -0.05237,-0.224583 -0.09849,-0.452581 -0.227998,-0.711604
z m -0.355802,1.423208 v 0.711604 h 5.692832 v -0.711604 z m 0,1.423208 v 0.711604 h 5.692832 v -0.711604 z m
0,1.423208 v 0.711604 h 5.692832 V 22.5 Z m 0,1.423208 -0.711604,0.711605 h 5.692832 l 0.711604,-0.711605 z m
-1.423208,1.423209 c 0,0 0.100479,0.291473 0.289196,0.711604 h 6.471042 L 23.923207,25.346417 Z M
5.4215039,26.769625 c 0.7858954,0 1.423208,0.637312 1.423208,1.423208 0,0.785895 -0.6373126,1.423208
-1.423208,1.423208 l 1.423208,1.423208 c 0
,-0.7858
96 0.6373125,-1.423208 1.423208,-1.423208 0.7858954,0 1.4232079,0.637312 1.4232079,1.423208 0,0.785895
-0.6373125,1.423208 -1.4232079,1.423208 h -4.269624 v -4.269624 c 0,-0.785896 0.6373125,-1.423208
1.423208,-1.423208 z m 13.4871721,0 c 0.130651,0.243653 0.216613,0.45258 0.389105,0.711604 h 6.454533 c
0.189572,-0.392521 0.305705,-0.711604 0.305705,-0.711604 z m 20.669821,0 c 0.785895,0 1.423207,0.637312
1.423207,1.423208 v 4.269624 h -4.269623 c -0.785896,0 -1.423208,-0.637313 -1.423208,-1.423208 0,-0.785896
0.637312,-1.423208 1.423208,-1.423208 0.785895,0 1.423208,0.637312 1.423208,1.423208 l 1.423208,-1.423208 c
-0.785896,0 -1.423208,-0.637313 -1.423208,-1.423208 0,-0.785896 0.637312,-1.423208 1.423208,-1.423208 z m
-19.735911,1.423208 c 0.223728,0.259593 0.468804,0.501823 0.739498,0.711604 h 4.041626 c 0.284927,-0.220028
0.534273,-0.460266 0.722705,-0.711604 z"
+ style="stroke-width:2.846416;fill:#4a86cf;fill-opacity:1" /></svg>
\ No newline at end of file
diff --git a/src/js/guadec_map/maki-guadec-svg/karaoke-45.svg
b/src/js/guadec_map/maki-guadec-svg/karaoke-45.svg
new file mode 100644
index 0000000..656545d
--- /dev/null
+++ b/src/js/guadec_map/maki-guadec-svg/karaoke-45.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.1"
+ id="svg4619"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+ sodipodi:docname="karaoke-45.svg"
+ x="0px"
+ y="0px"
+ width="45"
+ height="45"
+ viewBox="0 0 45 45"
+ xml:space="preserve"><metadata
+ id="metadata8"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs6" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1916"
+ inkscape:window-height="1153"
+ id="namedview4"
+ showgrid="false"
+ inkscape:zoom="5.6686394"
+ inkscape:cx="-29.87399"
+ inkscape:cy="14.663949"
+ inkscape:window-x="0"
+ inkscape:window-y="45"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg4619" /><g
+ transform="matrix(3.976542,0,0,3.976542,-7.8045513,-7.0363826)"
+ id="g8"
+ style="fill:#4a86cf;fill-opacity:1"><path
+ inkscape:connector-curvature="0"
+ d="M 12.1,2.952 A 2.988,2.988 0 0 0 6.99,4.917 l 3.142,3.142 A 2.988,2.988 0 0 0 12.1,2.952 Z"
+ id="path4"
+ style="fill:#4a86cf;fill-opacity:1" /><path
+ inkscape:connector-curvature="0"
+ d="M 4.672,8.255 2.55,10.377 a 1,1 0 0 0 0,1.414 l 0.707,0.707 a 1,1 0 0 0 1.414,0 L 6.792,10.377
8.914,8.255 6.793,6.134 Z M 5.413,10.342 4.706,9.635 6.793,7.548 7.5,8.255 Z"
+ id="path6"
+ style="fill:#4a86cf;fill-opacity:1" /></g></svg>
\ No newline at end of file
diff --git a/src/js/guadec_map/maki-guadec-svg/lodging-45.svg
b/src/js/guadec_map/maki-guadec-svg/lodging-45.svg
new file mode 100644
index 0000000..4c9a9f4
--- /dev/null
+++ b/src/js/guadec_map/maki-guadec-svg/lodging-45.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.1"
+ id="svg4619"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+ sodipodi:docname="lodging-45.svg"
+ x="0px"
+ y="0px"
+ width="45"
+ height="45"
+ viewBox="0 0 45 45"
+ xml:space="preserve"><metadata
+ id="metadata8"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs6" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1916"
+ inkscape:window-height="1153"
+ id="namedview4"
+ showgrid="false"
+ inkscape:zoom="5.6686394"
+ inkscape:cx="-29.87399"
+ inkscape:cy="14.663949"
+ inkscape:window-x="0"
+ inkscape:window-y="45"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg4619" /><path
+ inkscape:connector-curvature="0"
+ id="rect6507"
+ style="fill:#4a86cf;stroke-width:2.78089261;fill-opacity:1"
+ d="m 3.0337513,7.9003135 c -0.8342678,0 -1.3904463,0.556179 -1.3904463,1.390446 v 20.8566945 5.561785 c
0,0.834268 0.5561785,1.390447 1.3904463,1.390447 0.8342678,0 1.3904463,-0.556179 1.3904463,-1.390447 V
31.5379 H 40.575802 v 4.171339 c 0,0.834268 0.556178,1.390447 1.390446,1.390447 0.834268,0 1.390447,-0.556179
1.390447,-1.390447 v -5.561785 c 0,-0.834268 -0.556179,-1.390446 -1.390447,-1.390446 H 4.4241976 V 9.2907595
c 0,-0.834267 -0.5561785,-1.390446 -1.3904463,-1.390446 z m 8.3426777,1.390446 c -2.2247139,0
-4.1713389,1.9466255 -4.1713389,4.1713395 v 0 c 0,2.224713 1.946625,4.171338 4.1713389,4.171338 v 0 c
2.224714,0 4.171339,-1.946625 4.171339,-4.171338 v 0 c 0,-2.224715 -1.946625,-4.1713395 -4.171339,-4.1713395
z m 9.733124,2.7808925 c -4.171339,0 -4.171339,4.171339 -4.171339,4.171339 V 20.41433 H 8.5955366 c
-0.8342678,0 -1.3904464,0.556178 -1.3904464,1.390446 v 2.780893 c 0,0.834268 0.5561786,1.390446
1.3904464,1.390446 h 9.7331244 25.028034 v -6.952232 c 0,
-6.95223
1 -6.952232,-6.952231 -6.952232,-6.952231 z" /></svg>
\ No newline at end of file
diff --git a/src/js/guadec_map/maki-guadec-svg/marker-45.svg b/src/js/guadec_map/maki-guadec-svg/marker-45.svg
new file mode 100644
index 0000000..f8a35b9
--- /dev/null
+++ b/src/js/guadec_map/maki-guadec-svg/marker-45.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.1"
+ id="svg4619"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+ sodipodi:docname="marker-45.svg"
+ x="0px"
+ y="0px"
+ width="45"
+ height="45"
+ viewBox="0 0 45 45"
+ xml:space="preserve"><metadata
+ id="metadata8"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs6" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1916"
+ inkscape:window-height="1153"
+ id="namedview4"
+ showgrid="false"
+ inkscape:zoom="5.6686394"
+ inkscape:cx="-29.87399"
+ inkscape:cy="14.663949"
+ inkscape:window-x="0"
+ inkscape:window-y="45"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg4619" /><path
+ id="path4133"
+ inkscape:connector-curvature="0"
+ d="m 22.499999,2.1221302 c -6.608951,0 -14.3196662,4.0388936 -14.3196662,14.3196638 0,6.976025
11.0151902,22.397182 14.3196662,26.436076 2.937402,-4.038894 14.319668,-19.092706 14.319668,-26.436076
0,-10.2807702 -7.710717,-14.3196638 -14.319668,-14.3196638 z"
+ style="stroke-width:2.71704936;fill:#4a86cf;fill-opacity:1" /></svg>
\ No newline at end of file
diff --git a/src/js/guadec_map/maki-guadec-svg/suitcase-45.svg
b/src/js/guadec_map/maki-guadec-svg/suitcase-45.svg
new file mode 100644
index 0000000..f1bbff7
--- /dev/null
+++ b/src/js/guadec_map/maki-guadec-svg/suitcase-45.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.1"
+ id="svg4619"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+ sodipodi:docname="suitcase-45.svg"
+ x="0px"
+ y="0px"
+ width="45"
+ height="45"
+ viewBox="0 0 45 45"
+ xml:space="preserve"><metadata
+ id="metadata8"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs6" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1916"
+ inkscape:window-height="1153"
+ id="namedview4"
+ showgrid="false"
+ inkscape:zoom="5.6686394"
+ inkscape:cx="-29.87399"
+ inkscape:cy="14.663949"
+ inkscape:window-x="0"
+ inkscape:window-y="45"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg4619" /><path
+ id="path17"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csccsccssccssccccccc"
+ d="M 33.10047,13.413883 V 7.3564724 c 0,-3.0287055 -3.028707,-3.0287055 -3.028707,-3.0287055 h -14.993
c 0,0 -3.343387,0.00454 -3.179233,3.0287055 V 13.413883 H 5.84212 c 0,0 -3.0287055,0 -3.0287055,3.028706 v
21.200939 c 0,3.028705 3.0287055,3.028705 3.0287055,3.028705 h 33.315761 c 0,0 3.028705,0 3.028705,-3.028705
V 16.442589 c 0,-3.028706 -3.028705,-3.028706 -3.028705,-3.028706 z M 16.442589,8.8708252 H 28.557411 V
13.413883 H 16.442589 Z"
+ style="stroke-width:3.0287056;fill:#4a86cf;fill-opacity:1" /></svg>
\ No newline at end of file
diff --git a/src/js/guadec_map/maki-guadec-svg/village-45.svg
b/src/js/guadec_map/maki-guadec-svg/village-45.svg
new file mode 100644
index 0000000..dbbdd08
--- /dev/null
+++ b/src/js/guadec_map/maki-guadec-svg/village-45.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.1"
+ id="svg4619"
+ inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+ sodipodi:docname="village-45.svg"
+ x="0px"
+ y="0px"
+ width="45"
+ height="45"
+ viewBox="0 0 45 45"
+ xml:space="preserve"><metadata
+ id="metadata8"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs6" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1916"
+ inkscape:window-height="1153"
+ id="namedview4"
+ showgrid="false"
+ inkscape:zoom="5.6686394"
+ inkscape:cx="-29.87399"
+ inkscape:cy="14.663949"
+ inkscape:window-x="0"
+ inkscape:window-y="45"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg4619" /><path
+ inkscape:connector-curvature="0"
+ d="m 19.210366,11.00715 a 0.81851023,0.81851023 0 0 0 -1.157091,0 L 3.5896413,25.470784 a
0.82179742,0.82179742 0 0 0 0.5785454,1.393769 h 4.6020656 v 15.617438 a 0.81851023,0.81851023 0 0 0
0.8185102,0.81851 H 21.093926 a 0.81851023,0.81851023 0 0 0 0.825084,-0.811936 v 0 -17.84944 a
0.81851023,0.81851023 0 0 1 0.239965,-0.578545 l 4.690821,-5.414002 z m -0.578545,25.718972 h -3.28719 v
-3.28719 h 3.28719 z m 0,-6.57438 h -3.28719 v -3.287189 h 3.28719 z M 40.820352,17.002984 h -1.643595 a
0.82179742,0.82179742 0 0 0 -0.821797,0.821797 v 5.752582 l -4.352239,-5.995834 a 0.81851023,0.81851023 0 0 0
-1.157091,0 l -7.455346,9.059495 a 0.80864866,0.80864866 0 0 0 -0.184083,0.512801 v 15.318304 a
0.81851023,0.81851023 0 0 0 0.808649,0.828372 h 4.930784 a 0.83165899,0.83165899 0 0 0 0.834946,-0.828372 v 0
-5.746007 h 3.28719 v 5.74272 a 0.83165899,0.83165899 0 0 0 0.831659,0.831659 h 4.930785 a
0.82179742,0.82179742 0 0 0 0.811935,-0.81851 V 17.824781 A 0.82179742,0.82179742
0 0 0 4
0.820352,17.002984 Z M 31.78058,33.438932 h -3.287189 v -3.28719 h 3.287189 z m 6.57438,0 h -3.28719 v
-3.28719 h 3.28719 z"
+ id="path4"
+ style="stroke-width:3.28718972;fill:#4a86cf;fill-opacity:1" /></svg>
\ No newline at end of file
diff --git a/src/js/guadec_map/sprite.json b/src/js/guadec_map/sprite.json
index ea3e765..ab4a54e 100644
--- a/src/js/guadec_map/sprite.json
+++ b/src/js/guadec_map/sprite.json
@@ -6,144 +6,186 @@
"x": 0,
"y": 0
},
- "bar-45": {
+ "bank-45": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 45,
"y": 0
},
- "bus-45": {
+ "bar-45": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 0,
"y": 45
},
- "cafe-45": {
+ "bus-45": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 45,
"y": 45
},
- "circle-11": {
- "height": 11,
- "pixelRatio": 1,
- "width": 11,
- "x": 315,
- "y": 0
- },
- "circle-45": {
+ "cafe-45": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 90,
"y": 0
},
- "gnome-guadec-blue": {
+ "circle-11": {
+ "height": 11,
+ "pixelRatio": 1,
+ "width": 11,
+ "x": 225,
+ "y": 90
+ },
+ "circle-45": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 135,
"y": 0
},
- "gnome-guadec-red": {
+ "gnome-guadec-blue": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 90,
"y": 45
},
- "gnome-guadec-yellow": {
+ "gnome-guadec-red": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 135,
"y": 45
},
- "home-45": {
+ "gnome-guadec-yellow": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 0,
"y": 90
},
- "hospital-45": {
+ "home-45": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 45,
"y": 90
},
- "music-45": {
+ "hospital-45": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 90,
"y": 90
},
- "park-45": {
+ "karaoke-45": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 135,
"y": 90
},
- "parking-45": {
+ "lodging-45": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 0,
"y": 135
},
- "rail-45": {
+ "marker-45": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 45,
"y": 135
},
- "restaurant-45": {
+ "music-45": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 90,
"y": 135
},
- "rocket-45": {
+ "park-45": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 135,
"y": 135
},
+ "parking-45": {
+ "height": 45,
+ "pixelRatio": 1,
+ "width": 45,
+ "x": 180,
+ "y": 0
+ },
+ "rail-45": {
+ "height": 45,
+ "pixelRatio": 1,
+ "width": 45,
+ "x": 225,
+ "y": 0
+ },
+ "restaurant-45": {
+ "height": 45,
+ "pixelRatio": 1,
+ "width": 45,
+ "x": 270,
+ "y": 0
+ },
+ "rocket-45": {
+ "height": 45,
+ "pixelRatio": 1,
+ "width": 45,
+ "x": 315,
+ "y": 0
+ },
"star-11": {
"height": 11,
"pixelRatio": 1,
"width": 11,
- "x": 326,
- "y": 0
+ "x": 236,
+ "y": 90
},
"star-45": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 180,
- "y": 0
+ "y": 45
},
- "theatre-45": {
+ "suitcase-45": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 225,
- "y": 0
+ "y": 45
},
- "town-hall-45": {
+ "theatre-45": {
"height": 45,
"pixelRatio": 1,
"width": 45,
"x": 270,
- "y": 0
+ "y": 45
+ },
+ "town-hall-45": {
+ "height": 45,
+ "pixelRatio": 1,
+ "width": 45,
+ "x": 315,
+ "y": 45
+ },
+ "village-45": {
+ "height": 45,
+ "pixelRatio": 1,
+ "width": 45,
+ "x": 180,
+ "y": 90
}
}
\ No newline at end of file
diff --git a/src/js/guadec_map/sprite.png b/src/js/guadec_map/sprite.png
index f6ad956..0efc1ae 100644
Binary files a/src/js/guadec_map/sprite.png and b/src/js/guadec_map/sprite.png differ
diff --git a/src/js/guadec_map/sprite 2x json b/src/js/guadec_map/sprite 2x json
index 5509a0b..8c8b10a 100644
--- a/src/js/guadec_map/sprite 2x json
+++ b/src/js/guadec_map/sprite 2x json
@@ -6,144 +6,186 @@
"x": 0,
"y": 0
},
- "bar-45": {
+ "bank-45": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 90,
"y": 0
},
- "bus-45": {
+ "bar-45": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 0,
"y": 90
},
- "cafe-45": {
+ "bus-45": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 90,
"y": 90
},
- "circle-11": {
- "height": 22,
- "pixelRatio": 2,
- "width": 22,
- "x": 630,
- "y": 0
- },
- "circle-45": {
+ "cafe-45": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 180,
"y": 0
},
- "gnome-guadec-blue": {
+ "circle-11": {
+ "height": 22,
+ "pixelRatio": 2,
+ "width": 22,
+ "x": 450,
+ "y": 180
+ },
+ "circle-45": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 270,
"y": 0
},
- "gnome-guadec-red": {
+ "gnome-guadec-blue": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 180,
"y": 90
},
- "gnome-guadec-yellow": {
+ "gnome-guadec-red": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 270,
"y": 90
},
- "home-45": {
+ "gnome-guadec-yellow": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 0,
"y": 180
},
- "hospital-45": {
+ "home-45": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 90,
"y": 180
},
- "music-45": {
+ "hospital-45": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 180,
"y": 180
},
- "park-45": {
+ "karaoke-45": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 270,
"y": 180
},
- "parking-45": {
+ "lodging-45": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 0,
"y": 270
},
- "rail-45": {
+ "marker-45": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 90,
"y": 270
},
- "restaurant-45": {
+ "music-45": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 180,
"y": 270
},
- "rocket-45": {
+ "park-45": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 270,
"y": 270
},
+ "parking-45": {
+ "height": 90,
+ "pixelRatio": 2,
+ "width": 90,
+ "x": 360,
+ "y": 0
+ },
+ "rail-45": {
+ "height": 90,
+ "pixelRatio": 2,
+ "width": 90,
+ "x": 450,
+ "y": 0
+ },
+ "restaurant-45": {
+ "height": 90,
+ "pixelRatio": 2,
+ "width": 90,
+ "x": 540,
+ "y": 0
+ },
+ "rocket-45": {
+ "height": 90,
+ "pixelRatio": 2,
+ "width": 90,
+ "x": 630,
+ "y": 0
+ },
"star-11": {
"height": 22,
"pixelRatio": 2,
"width": 22,
- "x": 652,
- "y": 0
+ "x": 472,
+ "y": 180
},
"star-45": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 360,
- "y": 0
+ "y": 90
},
- "theatre-45": {
+ "suitcase-45": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 450,
- "y": 0
+ "y": 90
},
- "town-hall-45": {
+ "theatre-45": {
"height": 90,
"pixelRatio": 2,
"width": 90,
"x": 540,
- "y": 0
+ "y": 90
+ },
+ "town-hall-45": {
+ "height": 90,
+ "pixelRatio": 2,
+ "width": 90,
+ "x": 630,
+ "y": 90
+ },
+ "village-45": {
+ "height": 90,
+ "pixelRatio": 2,
+ "width": 90,
+ "x": 360,
+ "y": 180
}
}
\ No newline at end of file
diff --git a/src/js/guadec_map/sprite 2x png b/src/js/guadec_map/sprite 2x png
index 53ab608..38259c6 100644
Binary files a/src/js/guadec_map/sprite 2x png and b/src/js/guadec_map/sprite 2x png differ
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
