diff --git a/couches/autogestion.geojson b/couches/autogestion.geojson
index 4a67bc4..e341497 100644
--- a/couches/autogestion.geojson
+++ b/couches/autogestion.geojson
@@ -3,8 +3,9 @@
"name": "autogestion",
"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
"features": [
-{ "type": "Feature", "properties": { "name": "Tableau de programmation", "schedule": true, "show-on-empty-map": true }, "geometry": { "type": "Point", "coordinates": [ -2.091304219258237, 47.541608316100941 ] } },
-{ "type": "Feature", "properties": { "name": "Tableau des shifts", "autogestion": "shifts", "show-on-empty-map": true }, "geometry": { "type": "Point", "coordinates": [ -2.091287983083753, 47.541680943841193 ] } },
-{ "type": "Feature", "properties": { "name": "Signaletik autonome", "autogestion": "true", "schedule": false, "show-on-empty-map": true }, "geometry": { "type": "Point", "coordinates": [ -2.091928130059166, 47.541899432098248 ] } }
+{ "type": "Feature", "properties": { "name": "Tableau de programmation", "schedule": true, "show-on-empty-map": true, "signaletique": false, "care": false }, "geometry": { "type": "Point", "coordinates": [ -2.091304219258237, 47.541608316100941 ] } },
+{ "type": "Feature", "properties": { "name": "Tableau des shifts", "autogestion": "shifts", "show-on-empty-map": true, "signaletique": false, "care": false }, "geometry": { "type": "Point", "coordinates": [ -2.091287983083753, 47.541680943841193 ] } },
+{ "type": "Feature", "properties": { "name": "Signaletik autonome", "autogestion": "true", "schedule": false, "show-on-empty-map": true, "signaletique": true, "care": false }, "geometry": { "type": "Point", "coordinates": [ -2.091927051755329, 47.541898687391047 ] } },
+{ "type": "Feature", "properties": { "name": "Loges soin² ♡", "autogestion": "", "schedule": false, "show-on-empty-map": true, "signaletique": false, "care": true }, "geometry": { "type": "Point", "coordinates": [ -2.092301748874837, 47.541977698301473 ] } }
]
}
diff --git a/couches/dons.geojson b/couches/dons.geojson
index 755ef84..59dde92 100644
--- a/couches/dons.geojson
+++ b/couches/dons.geojson
@@ -3,6 +3,6 @@
"name": "dons",
"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
"features": [
-{ "type": "Feature", "properties": { "name": "Autel a dons", "dons": true, "show-on-empty-map": true }, "geometry": { "type": "Point", "coordinates": [ -2.091620623857878, 47.541649326798037 ] } }
+{ "type": "Feature", "properties": { "name": "Autel a dons", "dons": true, "show-on-empty-map": true }, "geometry": { "type": "Point", "coordinates": [ -2.091609823999334, 47.54171174171023 ] } }
]
}
diff --git a/couches/espace-camp.geojson b/couches/espace-camp.geojson
index 66e17b9..6e9b71d 100644
--- a/couches/espace-camp.geojson
+++ b/couches/espace-camp.geojson
@@ -3,7 +3,7 @@
"name": "escape-camp",
"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
"features": [
-{ "type": "Feature", "properties": { "name": "Place du hack", "pretalx-room-id": 79, "color": "#8800ff", "silence": false, "mixite-choisie": false, "show-on-empty-map": true, "description": "En extérieur, sur la place principale" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.091805040085028, 47.541701766596688 ], [ -2.091277928811364, 47.541660578268861 ], [ -2.091297465103123, 47.541543398333239 ], [ -2.09133262300134, 47.541511106482332 ], [ -2.091437324776295, 47.541519725938663 ], [ -2.091441155329037, 47.541495160484395 ], [ -2.091581663256304, 47.541507188313304 ], [ -2.091607071700462, 47.541560550439222 ], [ -2.091830101376965, 47.54158087885385 ], [ -2.091805040085028, 47.541701766596688 ] ] ] } },
+{ "type": "Feature", "properties": { "name": "Place du hack", "pretalx-room-id": 79, "color": "#8800ff", "silence": false, "mixite-choisie": false, "show-on-empty-map": true, "description": "En extérieur, sur la place principale" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.091632762533958, 47.541689211835447 ], [ -2.091277928811364, 47.541660578268861 ], [ -2.091297465103123, 47.541543398333239 ], [ -2.09133262300134, 47.541511106482332 ], [ -2.091437324776295, 47.541519725938663 ], [ -2.091441155329037, 47.541495160484395 ], [ -2.091581663256304, 47.541507188313304 ], [ -2.091607071700462, 47.541560550439222 ], [ -2.091657823825895, 47.541568324092609 ], [ -2.091632762533958, 47.541689211835447 ] ] ] } },
{ "type": "Feature", "properties": { "name": "Le Village", "pretalx-room-id": 80, "color": "#ffbf3e", "silence": false, "mixite-choisie": false, "show-on-empty-map": true, "description": "Le Terrain de Basket, en face du bâtiment principal" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.091187873844089, 47.541721147812432 ], [ -2.091091078898438, 47.541715022024484 ], [ -2.090980940350053, 47.541708703451881 ], [ -2.090846814128177, 47.541698601072575 ], [ -2.090858209256895, 47.541611275044822 ], [ -2.090878438257691, 47.541515685200345 ], [ -2.090921871198221, 47.541519979769028 ], [ -2.091149307107931, 47.541532269021332 ], [ -2.091292230894869, 47.541541968219065 ], [ -2.091282400158202, 47.54159607949984 ], [ -2.091270300789995, 47.541673162454302 ], [ -2.091264251105892, 47.541725231670661 ], [ -2.091187873844089, 47.541721147812432 ] ] ] } },
{ "type": "Feature", "properties": { "name": "Hackspace de l'Antenne", "pretalx-room-id": 83, "color": "#ff4e00", "silence": false, "mixite-choisie": false, "show-on-empty-map": true, "description": "Dans le hackspace Antenne Paulette" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.092263165738026, 47.54180664575258 ], [ -2.092179210322974, 47.541800128210419 ], [ -2.092185087202028, 47.541769524088551 ], [ -2.092268622840005, 47.541775758262965 ], [ -2.092263165738026, 47.54180664575258 ] ] ] } },
{ "type": "Feature", "properties": { "name": "Goldor'hack space", "pretalx-room-id": 78, "color": "#FF0078", "silence": false, "mixite-choisie": false, "show-on-empty-map": true, "description": "Salle principale du bâtiment principal" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.091884230925479, 47.541816612340668 ], [ -2.091956106198136, 47.541823861042808 ], [ -2.091968878171803, 47.541753246694022 ], [ -2.091894733933247, 47.541748421064973 ], [ -2.091884230925479, 47.541816612340668 ] ] ] } },
@@ -17,6 +17,7 @@
{ "type": "Feature", "properties": { "name": "Godor'hack salon", "pretalx-room-id": 86, "color": "#33d8d8", "silence": false, "mixite-choisie": false, "capacity": null, "show-on-empty-map": true }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.091955558299201, 47.541825363600097 ], [ -2.091883472455494, 47.541818683408877 ], [ -2.091870713140159, 47.541887230082047 ], [ -2.091941233352504, 47.541892570622558 ], [ -2.091955558299201, 47.541825363600097 ] ] ] } },
{ "type": "Feature", "properties": { "name": "Free shop", "pretalx-room-id": null, "color": "#ffa114", "silence": false, "mixite-choisie": false, "capacity": null, "show-on-empty-map": true }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.091930967140704, 47.541938181094721 ], [ -2.091864356138563, 47.54193286256114 ], [ -2.09187018150202, 47.541903379808758 ], [ -2.091936935868495, 47.541909009737239 ], [ -2.091930967140704, 47.541938181094721 ] ] ] } },
{ "type": "Feature", "properties": { "name": "Retr'old O'Rack", "pretalx-room-id": 85, "color": "#1504f9", "silence": false, "mixite-choisie": false, "capacity": null, "show-on-empty-map": true, "description": "Retrograming / gaming, en salle Goldorack" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.091779361454828, 47.541845670767053 ], [ -2.091845972456968, 47.541853084492701 ], [ -2.091833318754053, 47.541929316871787 ], [ -2.091766230253688, 47.541924320672756 ], [ -2.091779361454828, 47.541845670767053 ] ] ] } },
-{ "type": "Feature", "properties": { "name": "Tente de la piscine", "pretalx-room-id": 88, "color": "#e620fc", "silence": false, "mixite-choisie": false, "capacity": null, "show-on-empty-map": true, "description": "Derrière la piscine" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.091880579295232, 47.542311414169362 ], [ -2.091885354946226, 47.542261675794634 ], [ -2.091739356472972, 47.542255228224093 ], [ -2.091733898586122, 47.542304045524219 ], [ -2.091880579295232, 47.542311414169362 ] ] ] } }
+{ "type": "Feature", "properties": { "name": "Tente de la piscine", "pretalx-room-id": 88, "color": "#e620fc", "silence": false, "mixite-choisie": false, "capacity": null, "show-on-empty-map": true, "description": "Derrière la piscine" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.091880579295232, 47.542311414169362 ], [ -2.091885354946226, 47.542261675794634 ], [ -2.091739356472972, 47.542255228224093 ], [ -2.091733898586122, 47.542304045524219 ], [ -2.091880579295232, 47.542311414169362 ] ] ] } },
+{ "type": "Feature", "properties": { "name": "Tente de la prairie", "pretalx-room-id": 87, "color": "#0af902 ", "silence": false, "mixite-choisie": false, "capacity": null, "show-on-empty-map": true, "description": "Dans la prairie derrière le bâtiment principal en avant des dortoirs" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.091786018504423, 47.541690917922239 ], [ -2.091646069136527, 47.541678269853534 ], [ -2.091656010894903, 47.541626645051657 ], [ -2.091797489764087, 47.541639293132825 ], [ -2.091786018504423, 47.541690917922239 ] ] ] } }
]
}
diff --git a/icons/care.svg b/icons/care.svg
new file mode 100644
index 0000000..903c016
--- /dev/null
+++ b/icons/care.svg
@@ -0,0 +1,65 @@
+
+
+
+
diff --git a/icons/drinks.svg b/icons/drinks.svg
new file mode 100644
index 0000000..4771c73
--- /dev/null
+++ b/icons/drinks.svg
@@ -0,0 +1,66 @@
+
+
+
+
diff --git a/icons/fire.svg b/icons/fire.svg
index dd0906a..154305e 100644
--- a/icons/fire.svg
+++ b/icons/fire.svg
@@ -23,9 +23,9 @@
inkscape:pagecheckerboard="1"
inkscape:deskcolor="#505050"
inkscape:document-units="px"
- inkscape:zoom="7.8848409"
- inkscape:cx="22.067661"
- inkscape:cy="15.345903"
+ inkscape:zoom="14.327643"
+ inkscape:cx="18.705101"
+ inkscape:cy="17.378993"
inkscape:window-width="1714"
inkscape:window-height="1081"
inkscape:window-x="0"
@@ -48,13 +48,13 @@
height="24.975895"
x="2.2888184e-05"
y="3.470149" />
+
+
+
diff --git a/js/symbols.js b/js/symbols.js
index 87a8765..bdcb816 100644
--- a/js/symbols.js
+++ b/js/symbols.js
@@ -76,6 +76,18 @@ function getBaseSymbolForFeature(feature){
return STAGE_SYMBOL
}
+ if(feature.properties["bar"]){
+ return DRINKS_SYMBOL;
+ }
+
+ if(feature.properties["care"]){
+ return SOINSOIN_SYMBOL;
+ }
+
+ if(feature.properties["signaletique"]){
+ return SIGNALETIQUE_SYMBOL;
+ }
+
if(feature.properties["autogestion"] == "shifts"){
return SHIFTS_SYMBOL
}
@@ -450,4 +462,48 @@ export const BRAZERO_SYMBOL = new MapSymbol()
"brazero",
"flamme"
]
+}
+
+export const SOINSOIN_SYMBOL = new MapSymbol()
+{
+ SOINSOIN_SYMBOL.genericName = "Soin²"
+ SOINSOIN_SYMBOL.markerUrl = new URL("../icons/care.svg", import.meta.url)
+ SOINSOIN_SYMBOL.indexSynonyms = [
+ "care",
+ "awareness",
+ "soin",
+ "soin sécu",
+ "soin secu",
+ "soin-sécu",
+ "soin-secu"
+ ]
+}
+
+export const SIGNALETIQUE_SYMBOL = new MapSymbol()
+{
+ SIGNALETIQUE_SYMBOL.genericName = "Signalétique"
+ SIGNALETIQUE_SYMBOL.markerUrl = new URL("../icons/signaletik.svg", import.meta.url)
+ SIGNALETIQUE_SYMBOL.indexSynonyms = [
+ "paneau",
+ "gaffer",
+ "scotch",
+ "posca",
+ "peinture",
+ "signaletik",
+ "signaletique"
+ ]
+}
+
+export const DRINKS_SYMBOL = new MapSymbol()
+{
+ DRINKS_SYMBOL.genericName = "Boissons"
+ DRINKS_SYMBOL.markerUrl = new URL("../icons/drinks.svg", import.meta.url)
+ DRINKS_SYMBOL.indexSynonyms = [
+ "tireuses",
+ "boissons",
+ "bière",
+ "softs",
+ "kefir",
+ "maté"
+ ]
}
\ No newline at end of file