diff --git a/proj/map/asset/js/.main.js.swp b/proj/map/asset/js/.main.js.swp index 80b3d06..5222c17 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 b1b02ba..e0db45a 100644 --- a/proj/map/asset/js/db.js +++ b/proj/map/asset/js/db.js @@ -291,6 +291,12 @@ let SanTelmo = { ] }, */ + }, + sections : { + pizza : { + //diavolo, + //reine, + } } }, time : { diff --git a/proj/map/asset/js/main.js b/proj/map/asset/js/main.js index 02af7ff..35da5c2 100644 --- a/proj/map/asset/js/main.js +++ b/proj/map/asset/js/main.js @@ -39,6 +39,9 @@ Vue.component('Menu',{ fr : "(hors boissons)", en : "(excluding drinks)", it : "(bevande escluse)", + }, + indicatif : { + fr : "menu fournis à titre indicatif", } } }, diff --git a/proj/map/asset/js/map.js b/proj/map/asset/js/map.js index d4adf8c..94f1bd0 100644 --- a/proj/map/asset/js/map.js +++ b/proj/map/asset/js/map.js @@ -39,7 +39,7 @@ var markPointerIcon = L.icon({ }); var markRestoIcon = L.icon({ - iconUrl: 'asset/markers/resto-42x56.png', + iconUrl: 'asset/markers/resto-32x41.png', iconSize: [41, 32], iconAnchor: [20.5, 32], popupAnchor: [0, -38], @@ -52,6 +52,12 @@ var markParkingIcon = L.icon({ popupAnchor: [0, -38], }); +var markTrainIcon = L.icon({ + iconUrl: 'asset/markers/train-32x27.png', + iconSize: [27, 32], + iconAnchor: [13.5, 32], + popupAnchor: [0, -38], +}); var marker = L.marker(hotelxy, { icon: markPointerIcon, @@ -92,6 +98,9 @@ function iToZL(i) { return lay } +train = L.marker([-7.71,23.95], { + icon: markTrainIcon, +}).addTo(layzl2) let parking = jdb.data.db.parking.sub Object.entries(parking).forEach(p => { diff --git a/proj/map/asset/markers/markers.svg b/proj/map/asset/markers/markers.svg index dd1b4e2..32fec29 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.30106958" - inkscape:cx="5547.9727" - inkscape:cy="-8955.9688" + inkscape:zoom="0.40799189" + inkscape:cx="7522.7161" + inkscape:cy="-8007.5984" inkscape:document-units="mm" inkscape:current-layer="g5160" inkscape:document-rotation="0" - showgrid="true" + showgrid="false" 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="true" + inkscape:snap-global="false" inkscape:window-width="1280" inkscape:window-height="779" inkscape:window-x="0" @@ -74,6 +74,18 @@ position="-924.36032,2378.9418" orientation="1,0" id="guide5147" /> + + + @@ -401,15 +413,132 @@ d="m 4473.678,-2213.9979 h 38.0558 l 152.2234,-190.2793 h -38.0558 z" id="path7901" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/proj/map/asset/markers/resto-32x41.png b/proj/map/asset/markers/resto-32x41.png index b56b0c3..0034a27 100644 Binary files a/proj/map/asset/markers/resto-32x41.png and b/proj/map/asset/markers/resto-32x41.png differ diff --git a/proj/map/asset/markers/train-32x27.png b/proj/map/asset/markers/train-32x27.png new file mode 100644 index 0000000..a65461b Binary files /dev/null and b/proj/map/asset/markers/train-32x27.png differ