diff --git a/proj/map/asset/css/style.css b/proj/map/asset/css/style.css index 09cf796..1a74e04 100644 --- a/proj/map/asset/css/style.css +++ b/proj/map/asset/css/style.css @@ -292,7 +292,7 @@ section.restomenu section.top p{ section.restomenu div.dish h3 { margin-bottom: 0px; - margin-top: 30px; + margin-top: 0px; } section.restomenu div.dish p { @@ -304,6 +304,17 @@ section.restomenu div.dish p { line-height: 1rem; } +section.restomenu ul { + margin-left: 0px; + padding-left: 0px; +} + +section.restomenu h2 { + margin-top: 30px; + text-decoration: underline; + text-underline-offset: 10px; + text-decoration-thickness: 5px; +} ::-webkit-scrollbar { display: none; diff --git a/proj/map/asset/img/ilviaggio.jpg b/proj/map/asset/img/ilviaggio.jpg new file mode 100644 index 0000000..dd933fc Binary files /dev/null and b/proj/map/asset/img/ilviaggio.jpg differ diff --git a/proj/map/asset/js/.main.js.swp b/proj/map/asset/js/.main.js.swp index 5222c17..9a90836 100644 Binary files a/proj/map/asset/js/.main.js.swp and b/proj/map/asset/js/.main.js.swp differ diff --git a/proj/map/asset/js/db.js b/proj/map/asset/js/db.js index e0db45a..7bdfea6 100644 --- a/proj/map/asset/js/db.js +++ b/proj/map/asset/js/db.js @@ -1,381 +1,8 @@ -let ingredients = { - tomate : { - fr: "tomate", - en: "tomato", - it: "pomodoro", - }, - mozzarella : { - fr: "mozzarella", - en: "mozzarella", - it: "mozzarella", - }, - mozzarellaBufala: { - fr: "mozzarella de bufflonne", - en: "buffalo's mozzarella", - it: "mozzarella di bufala", - }, - saucissecalabraisepiquante : { - fr: "saucisse calabraise piquante", - en: "spicy sausage", - it: "sopressata calabrese piccante", - }, - jambonblanc : { - fr: "jambon blanc", - en: "white ham", - it: "prosciutto cotto", - }, - champignons : { - fr: "champignons", - en: "mushrooms", - it: "funghi", - }, - provoletta : { - fr : "provoletta", - en : "provoletta", - it : "provoletta", - }, - salsiccia :{ - fr : "chaire à saucisse", - en : "sausage", - it : "salsiccia", - }, - chimichurri : { - fr : "chimichurri", - en : "chimichurri", - it : "chimichurri", - }, - gorgonzola : { - fr : "gorgonzola", - en : "gorgonzola", - it : "gorgonzola", - }, - parma : { - fr : "parma", - en : "jambon de Parme", - it : "Parma ham", - }, - noix : { - fr : "noix", - en : "nuts", - it : "noci", - }, - caprino : { - fr : "fromage de chèvre", - en : "goat cheese", - it : "caprino", - }, - honey : { - fr : "miel", - en : "honey", - it : "miele", - }, - bresaola : { - fr : "bresaola", - en : "bresaola", - it : "bresaola", - }, - roquette : { - fr : "roquette", - en : "aragula salad", - it : "rucola", - }, - crudaioladipomodoro : { - fr : "tomates fraîches concassées", - en : "fresh tomatoes", - it : "crudaiola di pomodoro", - }, - burrata : { - fr : "burrata", - en : "burrata", - it : "burrata", - }, - basilic : { - fr : "basilic", - en : "basil", - it : "basilico", - }, - thon : { - fr : "thon", - en : "tuna", - it : "tono", - }, - cipollaTropea : { - fr : "oignons rouges de Tropea", - en : "red onions from Tropea", - it : "cipolla rossa di Tropea", - }, - aubergines : { - fr : "aubergines", - en : "eggplants", - it : "melanzane", - }, - anchois : { - fr : "anchois", - en : "anchovies", - it : "acciughe", - }, - capres : { - fr : "câpres", - en : "capers", - it : "capperi", - }, - huileextravierge : { - fr : "huile extra vierge", - en : "extra olive oil", - it : "olio extra vergine", - }, - name : { - fr : "", - en : "", - it : "", - }, - name : { - fr : "", - en : "", - it : "", - }, - name : { - fr : "", - en : "", - it : "", - }, - name : { - fr : "", - en : "", - it : "", - }, - name : { - fr : "", - en : "", - it : "", - }, - name : { - fr : "", - en : "", - it : "", - }, - name : { - fr : "", - en : "", - it : "", - }, -} - -let SanTelmo = { - isActive: false, - id: "santelmo", - type : "item", - name: "San Telmo", - xy: [-11.42,27.20], - dirxy: [-12.98,35.95], - dirzl: 4, - minz: 3, - img: "https://ed.brz9.dev/proj/map/asset/img/santelmo.jpg", - txtFR: "Français Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", - txtEN: "English Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", - txtIT: "Italiano Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", - card : { - tabs : { - menu : { - tabtype : "menu", - priceRange : "17-25€", - dishes : { - diavolo : { - name : "Pizza Diavolo", - ing : [ - ingredients.tomate, - ingredients.mozzarella, - ingredients.saucissecalabraisepiquante - ] - }, - d10s : { - name : "Pizza D10S", - ing : [ - ingredients.tomate, - ingredients.mozzarella, - ingredients.provoletta, - ingredients.salsiccia, - ingredients.chimichurri - ] - }, - navigli : { - name : "Pizza Navigli", - ing : [ - ingredients.tomate, - ingredients.mozzarella, - ingredients.gorgonzola, - ingredients.parma - ] - }, - brachet : { - name : "Pizza Brachet (bianca - blanche - white)", - ing : [ - ingredients.mozzarella, - ingredients.caprino, - ingredients.noix, - ingredients.honey - ] - }, - superibricchi : { - name : "Pizza Sù Per I Bricchi", - ing : [ - ingredients.tomate, - ingredients.mozzarella, - ingredients.caprino, - ingredients.bresaola, - ingredients.roquette - ] - }, - superibricchi : { - name : "Pizza Sù Per I Bricchi", - ing : [ - ingredients.tomate, - ingredients.mozzarella, - ingredients.thon, - ingredients.cipollaTropea - ] - }, - reine : { - name : "Pizza Cotto e Funghi / Reine", - ing : [ - ingredients.tomate, - ingredients.mozzarella, - ingredients.jambonblanc, - ingredients.champignons - ] - }, - margherita : { - name : "Pizza Margherita", - ing : [ - ingredients.tomate, - ingredients.mozzarella - ] - }, - buffemel : { - name : "Pizza Bufala e Melanzane", - ing : [ - ingredients.tomate, - ingredients.mozzarellaBufala, - ingredients.aubergines - ] - }, - romana : { - name : "Pizza Romana", - ing : [ - ingredients.tomate, - ingredients.mozzarella, - ingredients.anchois, - ingredients.capres, - ingredients.huileextravierge - ] - }, - /* - pizza : { - name : "Pizza", - ing : [ - ingredients. , - ingredients. , - ingredients. , - ingredients. , - ingredients. , - ] - }, - pizza : { - name : "Pizza", - ing : [ - ingredients. , - ingredients. , - ingredients. , - ingredients. , - ingredients. , - ] - }, - */ - }, - sections : { - pizza : { - //diavolo, - //reine, - } - } - }, - time : { - tabtype : "time", - list : { - mon : "11h30-14h00 18h30-22h00", - tue : "11h30-14h00 18h30-22h00", - wed : "11h30-14h00 18h30-22h00", - thu : "11h30-14h00 18h30-22h00", - fri : "11h30-14h00 18h30-22h00", - sat : "11h30-14h00 18h30-22h00", - sun : "", - } - } - } - } -} - -let Novaa = { - isActive: false, - id: "novasocialfood", - type : "item", - name: "Noväa social food", - xy: [-14.60,17.97], - dirxy: [-18.48,35.68], - dirzl: 3, - minz: 3, - img: "https://ed.brz9.dev/proj/map/asset/img/santelmo.jpg", - txtFR: "Français Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", - txtEN: "English Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", - txtIT: "Italiano Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", - card : { - tabs : { - menu : { - tabtype : "menu", - priceRange : "18-32€", - dishes : { - divola : { - name : "Pizza Divola", - }, - regina : { - name : "Pizza Regina", - } - } - }, - time : { - tabtype : "time", - mon : "11h30-14h00 18h30-22h00", - tue : "11h30-14h00 18h30-22h00", - wed : "11h30-14h00 18h30-22h00", - thu : "11h30-14h00 18h30-22h00", - fri : "11h30-14h00 18h30-22h00", - sat : "11h30-14h00 18h30-22h00", - sun : "", - } - } - } -} - -let Salsamenteria = { - id: "salsamenteria", - isActive: false, - xy: [-21.96, -21.64], - dirxy: [-19.64,13.36], - dirzl: 3, - minz: 3, - type : "item", - name: "Salsamenteria di Parma", - img: "https://ed.brz9.dev/proj/map/asset/img/salsamentiera.jpg", - txtFR: "Français Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", - txtEN: "English Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", - txtIT: "Italiano Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", -} - var jdb = { data: { currentLang: 'fr', + currentRestoTagList: [], db : { - ingredients : ingredients, parking : { id : "parking", isActive: false, @@ -405,6 +32,8 @@ var jdb = { nameEN : "Restaurant", nameIT : "Ristoranti", sub : { + SanTelmo, + Salsamenteria, italiens : { id: "restoital", isActive: false, diff --git a/proj/map/asset/js/dishes.js b/proj/map/asset/js/dishes.js new file mode 100644 index 0000000..edb1348 --- /dev/null +++ b/proj/map/asset/js/dishes.js @@ -0,0 +1,123 @@ +let Dishes = { + santelmo : { + gnocchigor : { + name : "blank", + ing : [ + ingredients.gnochgor + ] + }, + diavolo : { + name : "Pizza Diavolo", + ing : [ + ingredients.tomate, + ingredients.mozzarella, + ingredients.saucissecalabraisepiquante + ] + }, + d10s : { + name : "Pizza D10S", + ing : [ + ingredients.tomate, + ingredients.mozzarella, + ingredients.provoletta, + ingredients.salsiccia, + ingredients.chimichurri + ] + }, + navigli : { + name : "Pizza Navigli", + ing : [ + ingredients.tomate, + ingredients.mozzarella, + ingredients.gorgonzola, + ingredients.parma + ] + }, + brachet : { + name : "Pizza Brachet (bianca - blanche - white)", + ing : [ + ingredients.mozzarella, + ingredients.caprino, + ingredients.noix, + ingredients.honey + ] + }, + superibricchi : { + name : "Pizza Sù Per I Bricchi", + ing : [ + ingredients.tomate, + ingredients.mozzarella, + ingredients.caprino, + ingredients.bresaola, + ingredients.roquette + ] + }, + superibricchi : { + name : "Pizza Sù Per I Bricchi", + ing : [ + ingredients.tomate, + ingredients.mozzarella, + ingredients.thon, + ingredients.cipollaTropea + ] + }, + reine : { + name : "Pizza Cotto e Funghi / Reine", + ing : [ + ingredients.tomate, + ingredients.mozzarella, + ingredients.jambonblanc, + ingredients.champignons + ] + }, + margherita : { + name : "Pizza Margherita", + ing : [ + ingredients.tomate, + ingredients.mozzarella + ] + }, + buffemel : { + name : "Pizza Bufala e Melanzane", + ing : [ + ingredients.tomate, + ingredients.mozzarellaBufala, + ingredients.aubergines + ] + }, + romana : { + name : "Pizza Romana", + ing : [ + ingredients.tomate, + ingredients.mozzarella, + ingredients.anchois, + ingredients.capres, + ingredients.huileextravierge + ] + }, + /* + pizza : { + name : "Pizza", + ing : [ + ingredients. , + ingredients. , + ingredients. , + ingredients. , + ingredients. , + ] + }, + pizza : { + name : "Pizza", + ing : [ + ingredients. , + ingredients. , + ingredients. , + ingredients. , + ingredients. , + ] + }, + */ + } +} + + diff --git a/proj/map/asset/js/ingredients.js b/proj/map/asset/js/ingredients.js new file mode 100644 index 0000000..1b4e915 --- /dev/null +++ b/proj/map/asset/js/ingredients.js @@ -0,0 +1,164 @@ +let ingredients = { + tomate : { + fr: "tomate", + en: "tomato", + it: "pomodoro", + }, + mozzarella : { + fr: "mozzarella", + en: "mozzarella", + it: "mozzarella", + }, + mozzarellaBufala: { + fr: "mozzarella de bufflonne", + en: "buffalo's mozzarella", + it: "mozzarella di bufala", + }, + saucissecalabraisepiquante : { + fr: "saucisse calabraise piquante", + en: "spicy sausage", + it: "sopressata calabrese piccante", + }, + jambonblanc : { + fr: "jambon blanc", + en: "white ham", + it: "prosciutto cotto", + }, + champignons : { + fr: "champignons", + en: "mushrooms", + it: "funghi", + }, + provoletta : { + fr : "provoletta", + en : "provoletta", + it : "provoletta", + }, + salsiccia :{ + fr : "chaire à saucisse", + en : "sausage", + it : "salsiccia", + }, + chimichurri : { + fr : "chimichurri", + en : "chimichurri", + it : "chimichurri", + }, + gorgonzola : { + fr : "gorgonzola", + en : "gorgonzola", + it : "gorgonzola", + }, + parma : { + fr : "parma", + en : "jambon de Parme", + it : "Parma ham", + }, + noix : { + fr : "noix", + en : "nuts", + it : "noci", + }, + caprino : { + fr : "fromage de chèvre", + en : "goat cheese", + it : "caprino", + }, + honey : { + fr : "miel", + en : "honey", + it : "miele", + }, + bresaola : { + fr : "bresaola", + en : "bresaola", + it : "bresaola", + }, + roquette : { + fr : "roquette", + en : "aragula salad", + it : "rucola", + }, + crudaioladipomodoro : { + fr : "tomates fraîches concassées", + en : "fresh tomatoes", + it : "crudaiola di pomodoro", + }, + burrata : { + fr : "burrata", + en : "burrata", + it : "burrata", + }, + basilic : { + fr : "basilic", + en : "basil", + it : "basilico", + }, + thon : { + fr : "thon", + en : "tuna", + it : "tono", + }, + cipollaTropea : { + fr : "oignons rouges de Tropea", + en : "red onions from Tropea", + it : "cipolla rossa di Tropea", + }, + aubergines : { + fr : "aubergines", + en : "eggplants", + it : "melanzane", + }, + anchois : { + fr : "anchois", + en : "anchovies", + it : "acciughe", + }, + capres : { + fr : "câpres", + en : "capers", + it : "capperi", + }, + huileextravierge : { + fr : "huile extra vierge", + en : "extra olive oil", + it : "olio extra vergine", + }, + gnochgor : { + fr : "Gnochi au Gorgonzolla", + en : "gdlkfgdfg", + it : "ksflskdfjl", + }, + name : { + fr : "", + en : "", + it : "", + }, + name : { + fr : "", + en : "", + it : "", + }, + name : { + fr : "", + en : "", + it : "", + }, + name : { + fr : "", + en : "", + it : "", + }, + name : { + fr : "", + en : "", + it : "", + }, + name : { + fr : "", + en : "", + it : "", + }, +} + + diff --git a/proj/map/asset/js/main.js b/proj/map/asset/js/main.js index 35da5c2..c3f3df3 100644 --- a/proj/map/asset/js/main.js +++ b/proj/map/asset/js/main.js @@ -11,12 +11,25 @@ Vue.component('Menu',{

{{ horsboissons.it }}

-
-

{{ d.name }}

-

{{ l2s(ings2ls(d.ing,"fr"), "fr") }}

-

{{ l2s(ings2ls(d.ing,"en"), "en") }}

-

{{ l2s(ings2ls(d.ing,"it"), "it") }}

-
+
+

{{ s.nameFR }}

+

{{ s.nameEN }}

+

{{ s.nameIT }}

+ +
+

{{ d.name }}

+ + +
+
`, props : { @@ -41,7 +54,9 @@ Vue.component('Menu',{ it : "(bevande escluse)", }, indicatif : { - fr : "menu fournis à titre indicatif", + fr : "Menu fournis à titre indicatif, soumis aux disponibilités", + en : "Menu provided as an indication, subject to availability", + it : "Menu fornito a titolo informativo, soggetto a disponibilità", } } }, @@ -176,6 +191,10 @@ Vue.component('Accordeon', {
+ +
diff --git a/proj/map/asset/js/map.js b/proj/map/asset/js/map.js index 94f1bd0..ca3f913 100644 --- a/proj/map/asset/js/map.js +++ b/proj/map/asset/js/map.js @@ -53,6 +53,13 @@ var markParkingIcon = L.icon({ }); var markTrainIcon = L.icon({ + iconUrl: 'asset/markers/train-40x34.png', + iconSize: [34, 40], + iconAnchor: [17, 40], + popupAnchor: [0, -38], +}); + +var markoTrainIcon = L.icon({ iconUrl: 'asset/markers/train-32x27.png', iconSize: [27, 32], iconAnchor: [13.5, 32], @@ -107,10 +114,18 @@ Object.entries(parking).forEach(p => { p[1]['marker'] = L.marker(p[1]['xy'], { icon: markParkingIcon, }).addTo(layzls[p[1]['minz']]); + p[1]['marker'].on('click', function(e) { + jdb.data.db.parking.isActive = true + p[1]['isActive'] = true + let target = document.getElementById(p[1]['id']) + target.scrollIntoView({ behavior: 'smooth' }) + }) + }) layParking.addTo(map) +/* Object.entries(resto).forEach(item => { Object.entries(item[1]['sub']).forEach(r => { if (typeof r[1]['xy'] !== "undefined") { @@ -128,6 +143,24 @@ Object.entries(resto).forEach(item => { } }) }) +*/ + +Object.entries(resto).forEach(r => { + if (typeof r[1]['xy'] !== "undefined") { + r[1]['marker'] = L.marker(r[1]['xy'], { + icon: markRestoIcon, + }).addTo(layzls[r[1]['minz']]); + r[1]['marker'].bindPopup(r[1]['name']) + r[1]['marker'].on('click', function(e) { + jdb.data.db.resto.isActive = true + r[1]['isActive'] = true + let target = document.getElementById(r[1]['id']) + target.scrollIntoView({ behavior: 'smooth' }) + }) + + } +}) + layResto.addTo(map) /* diff --git a/proj/map/asset/js/resto.js b/proj/map/asset/js/resto.js new file mode 100644 index 0000000..0373c3d --- /dev/null +++ b/proj/map/asset/js/resto.js @@ -0,0 +1,114 @@ + + +let SanTelmo = { + isActive: false, + id: "santelmo", + type : "item", + name: "San Telmo", + xy: [-11.42,27.20], + dirxy: [-12.98,35.95], + dirzl: 4, + minz: 3, + img: "https://ed.brz9.dev/proj/map/asset/img/santelmo.jpg", + txtFR: "Français Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", + txtEN: "English Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", + txtIT: "Italiano Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", + card : { + tabs : { + menu : { + tabtype : "menu", + priceRange : "17-25€", + dishes : { + }, + sections : { + pizza : { + nameFR : "Pizza", + nameEN : "Pizza", + nameIT : "Pizza", + list : [ + Dishes.santelmo.diavolo, + ], + }, + pates : { + nameFR: "Pâtes", + nameEN: "Pasta", + nameIT: "Pasta", + list : [ + Dishes.santelmo.gnocchigor, + ] + } + } + }, + time : { + tabtype : "time", + list : { + mon : "11h30-14h00 18h30-22h00", + tue : "11h30-14h00 18h30-22h00", + wed : "11h30-14h00 18h30-22h00", + thu : "11h30-14h00 18h30-22h00", + fri : "11h30-14h00 18h30-22h00", + sat : "11h30-14h00 18h30-22h00", + sun : "", + } + } + } + } +} + +let Novaa = { + isActive: false, + id: "novasocialfood", + type : "item", + name: "Noväa social food", + xy: [-14.60,17.97], + dirxy: [-18.48,35.68], + dirzl: 3, + minz: 3, + img: "https://ed.brz9.dev/proj/map/asset/img/santelmo.jpg", + txtFR: "Français Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", + txtEN: "English Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", + txtIT: "Italiano Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", + card : { + tabs : { + menu : { + tabtype : "menu", + priceRange : "18-32€", + dishes : { + divola : { + name : "Pizza Divola", + }, + regina : { + name : "Pizza Regina", + } + } + }, + time : { + tabtype : "time", + mon : "11h30-14h00 18h30-22h00", + tue : "11h30-14h00 18h30-22h00", + wed : "11h30-14h00 18h30-22h00", + thu : "11h30-14h00 18h30-22h00", + fri : "11h30-14h00 18h30-22h00", + sat : "11h30-14h00 18h30-22h00", + sun : "", + } + } + } +} + +let Salsamenteria = { + id: "salsamenteria", + isActive: false, + xy: [-21.96, -21.64], + dirxy: [-19.97,-7.73], + dirzl: 3, + minz: 3, + type : "item", + name: "Salsamenteria di Parma", + img: "https://ed.brz9.dev/proj/map/asset/img/salsamentiera.jpg", + txtFR: "Français Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", + txtEN: "English Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", + txtIT: "Italiano Adipisicing live-edge fam velit. Messenger bag poke laboris aesthetic viral do semiotics authentic est selfies.", +} + + diff --git a/proj/map/asset/markers/markers.svg b/proj/map/asset/markers/markers.svg index 32fec29..ba213b8 100644 --- a/proj/map/asset/markers/markers.svg +++ b/proj/map/asset/markers/markers.svg @@ -23,13 +23,13 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.40799189" - inkscape:cx="7522.7161" - inkscape:cy="-8007.5984" + inkscape:zoom="0.11462827" + inkscape:cx="9868.8229" + inkscape:cy="-7273.2058" inkscape:document-units="mm" inkscape:current-layer="g5160" inkscape:document-rotation="0" - showgrid="false" + showgrid="true" inkscape:snap-bbox="true" inkscape:snap-intersection-paths="true" inkscape:object-paths="true" @@ -41,7 +41,7 @@ inkscape:snap-midpoints="true" showguides="true" inkscape:guide-bbox="true" - inkscape:snap-global="false" + inkscape:snap-global="true" inkscape:window-width="1280" inkscape:window-height="779" inkscape:window-x="0" @@ -86,6 +86,18 @@ position="1661.5833,2699.4167" orientation="1,0" id="guide7941" /> + + + @@ -463,21 +475,29 @@ id="path7950" style="opacity:1;fill:#1c2729;fill-opacity:1;stroke:#b3bfb6;stroke-width:28.54189243;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" d="m 5976.1496,-1861.511 -19.9392,17.0908 -22.2239,19.0492 h -30.1166 l -24.0932,24.0933 v 6.0233 h 24.0932 l -18.07,18.0699 h -24.0932 l -24.0933,24.0933 v 6.0233 h 18.07 l -6.0234,6.0234 v 48.1865 h 24.0933 l 54.2099,-54.2099 h 228.886 l 54.2099,54.2099 h 24.0932 v -48.1865 l -6.0233,-6.0234 h 18.07 v -6.0233 l -24.0933,-24.0933 h -24.0932 l -18.07,-18.0699 h 18.07 v -6.0233 l -24.0934,-24.0933 h -24.0933 l -36.1398,-36.14 v -24.0931 -78.3031 h -72.2799 l -2e-4,102.3964 24.0935,-24.0933 -24.0935,24.0933 36.1402,36.1398 h -72.2799 l 36.1399,-36.14 v 0 -24.0931 -78.3031 h -72.2797 l -18.07,102.3962 z m 0,66.2566 h 132.513 l 18.07,18.0699 h -168.6528 z" - sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccc" /> + sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccc" + inkscape:export-xdpi="3.5438988" + inkscape:export-ydpi="3.5438988" /> + sodipodi:nodetypes="cccccccccc" + inkscape:export-xdpi="3.5438988" + inkscape:export-ydpi="3.5438988" /> + sodipodi:nodetypes="cccccccc" + inkscape:export-xdpi="3.5438988" + inkscape:export-ydpi="3.5438988" /> + style="fill:#b3bfb6;fill-opacity:1" + inkscape:export-xdpi="3.5438988" + inkscape:export-ydpi="3.5438988"> + ry="1.7497794e-05" + inkscape:export-xdpi="3.5438988" + inkscape:export-ydpi="3.5438988" /> @@ -539,6 +561,122 @@ style="opacity:1;fill:#b3bfb6;fill-opacity:1;stroke:none;stroke-width:12.2254;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers" d="m 7948.1377,-3030.9429 h 304.4468 c 10e-5,0 10e-5,0 10e-5,1e-4 v 114.1675 c 0,0 0,0 -10e-5,0 h -304.4468 c 0,0 0,0 0,0 v -114.1675 c 0,-1e-4 0,-1e-4 0,-1e-4 z" /> + + + + + + + + + + + + + + + + + + + + + diff --git a/proj/map/asset/markers/train-2-32x39.png b/proj/map/asset/markers/train-2-32x39.png new file mode 100644 index 0000000..80242d3 Binary files /dev/null and b/proj/map/asset/markers/train-2-32x39.png differ diff --git a/proj/map/asset/markers/train-40x34.png b/proj/map/asset/markers/train-40x34.png new file mode 100644 index 0000000..45f98f2 Binary files /dev/null and b/proj/map/asset/markers/train-40x34.png differ diff --git a/proj/map/index.html b/proj/map/index.html index 71c681d..ea4fd25 100644 --- a/proj/map/index.html +++ b/proj/map/index.html @@ -31,6 +31,7 @@
+