diff --git a/assets/amenities-btn.svg b/assets/amenities-btn.svg index 3ee8e70..69a848a 100644 --- a/assets/amenities-btn.svg +++ b/assets/amenities-btn.svg @@ -9,12 +9,13 @@ id="svg1" xml:space="preserve" inkscape:version="1.4 (e7c3feb100, 2024-10-09)" - sodipodi:docname="amenities-btn.svg" + sodipodi:docname="mockup.svg" inkscape:export-filename="assets/neon-border-image-corner.svg" inkscape:export-xdpi="96" inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">Piscine++++++++++++Piscine de l'AntenneAu centre de la pelouse d'entree sur le site, a cote des jeux pour enfantGrand atelier de nage libre, tous cyborg accepteEVENEMENTS A VENIRNage libre3 Juil17:00-19:00 hr { margin-top: 1ex; } -#map .highlight-point-icon.point-feature img ~ h3 { - opacity: clamp(0, calc( var(--zoom-level) - 20 ), 1) ; -} - -#map .highlight-point-icon img { - opacity: clamp(0, calc( var(--zoom-level) - 17 ), 1) ; -} - #map .highlight-point-icon:not(.active) { opacity: 0; @@ -415,18 +407,6 @@ camp-feature .feature-widgets > * { margin-bottom: 2em; } -camp-feature .feature-widgets > p:first-child { - margin-top: 0; -} - -camp-feature .feature-widgets > p + p { - margin-top: -1em; -} - -camp-feature .feature-widgets .author-widget { - text-align: right; -} - camp-feature .widget > :first-child { margin-top: 0; } diff --git a/icons/care.svg b/icons/care.svg deleted file mode 100644 index 903c016..0000000 --- a/icons/care.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - diff --git a/icons/drinks.svg b/icons/drinks.svg deleted file mode 100644 index 4771c73..0000000 --- a/icons/drinks.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - diff --git a/icons/fire.svg b/icons/fire.svg index 154305e..dd0906a 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="14.327643" - inkscape:cx="18.705101" - inkscape:cy="17.378993" + inkscape:zoom="7.8848409" + inkscape:cx="22.067661" + inkscape:cy="15.345903" 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/icons/search.svg b/icons/search.svg index 254d935..535d2ef 100644 --- a/icons/search.svg +++ b/icons/search.svg @@ -9,9 +9,10 @@ id="svg1" xml:space="preserve" inkscape:version="1.4 (e7c3feb100, 2024-10-09)" - sodipodi:docname="search.svg" + sodipodi:docname="mockup.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> + id="g16-5" + inkscape:label="Ecran recherche" + transform="translate(756.64896)" + inkscape:export-filename="/home/epickiwi/Downloads/mockup-screen/screen-4.png" + inkscape:export-xdpi="200" + inkscape:export-ydpi="200">Piscine++++++Piscine de l'AntenneAu centre de la pelouse d'entree sur le site, a cote des jeux pour enfantGrand atelier de nage libre, tous cyborg accepteEVENEMENTS A VENIRNage libre3 Juil17:00-19:00 diff --git a/icons/signaletik.svg b/icons/signaletik.svg deleted file mode 100644 index 7e497ab..0000000 --- a/icons/signaletik.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - diff --git a/index.html b/index.html index f3b1c38..3301234 100644 --- a/index.html +++ b/index.html @@ -37,8 +37,7 @@ - - + diff --git a/js/feature-widgets/author.js b/js/feature-widgets/author.js deleted file mode 100644 index c5ad8c1..0000000 --- a/js/feature-widgets/author.js +++ /dev/null @@ -1,13 +0,0 @@ -export function authorWidget(feature){ - if(feature.properties["village"] && feature.properties["author"]){ - let content = document.createElement("p") - content.classList.add("widget") - content.classList.add("author-widget") - - let em = document.createElement("em") - em.textContent = "— " + feature.properties["author"] - - content.append(em) - return content - } -} \ No newline at end of file diff --git a/js/feature-widgets/description.js b/js/feature-widgets/description.js deleted file mode 100644 index 4c48f75..0000000 --- a/js/feature-widgets/description.js +++ /dev/null @@ -1,17 +0,0 @@ -export function descriptionWiget(feature){ - if(feature.properties["description"]){ - let content = document.createElement("p") - content.classList.add("widget") - content.classList.add("description-widget") - - let lines = feature.properties["description"].split(/\r?\n/) - .flatMap((it, i, arr) => i < arr.length-1 ? - [document.createTextNode(it), document.createElement("br")] : - [document.createTextNode(it)] - ); - - content.replaceChildren(...lines) - - return content - } -} \ No newline at end of file diff --git a/js/feature-widgets/feature-widgets.js b/js/feature-widgets/feature-widgets.js index 3c47501..4de408d 100644 --- a/js/feature-widgets/feature-widgets.js +++ b/js/feature-widgets/feature-widgets.js @@ -1,10 +1,8 @@ -import { authorWidget } from "./author.js" import { campingCarsWidget } from "./camping-cars.js" import { capaciteDortoirWidget } from "./capacite-dortoir.js" import { capaciteEspaceWidget } from "./capacite-espace.js" import { capaciteParkingWidget } from "./capacite-parking.js" import { deposeMinuteWidget } from "./depose-minute.js" -import { descriptionWiget } from "./description.js" import { mixiteChoisieWidget } from "./mixite-choisie.js" import { upcomingTalksWidget } from "./upcoming-talks.js" import { zoneInterditeWidget } from "./zone-interdite.js" @@ -13,9 +11,6 @@ export const FEATURE_WIDGETS = [ // Boxes mixiteChoisieWidget, zoneInterditeWidget, - // Description - descriptionWiget, - authorWidget, // Other deposeMinuteWidget, campingCarsWidget, diff --git a/js/feature-widgets/mixite-choisie.js b/js/feature-widgets/mixite-choisie.js index 797000c..a8ab513 100644 --- a/js/feature-widgets/mixite-choisie.js +++ b/js/feature-widgets/mixite-choisie.js @@ -1,5 +1,5 @@ export function mixiteChoisieWidget(feature){ - if(feature.properties["mixite-choisie"] || feature.properties["non-mixte"]){ + if(feature.properties["mixite-choisie"]){ let content = document.createElement("div") content.classList.add("mixite-choisie-widget") content.classList.add("widget") @@ -15,7 +15,7 @@ export function mixiteChoisieWidget(feature){ content.append(description) } else { let p = document.createElement("p") - p.textContent = `Cet espace est en mixité choisie sans homme cisgenre` + p.textContent = `Cet espace est en mixité choisie sans mecs cis` content.append(p) } diff --git a/js/index.js b/js/index.js index aa21708..b7009d8 100644 --- a/js/index.js +++ b/js/index.js @@ -214,7 +214,6 @@ document.getElementById("explore-toggle-btn").addEventListener("click", () => { function bindButtonToCategory(button, category){ button.addEventListener("click", e => { e.preventDefault() - document.querySelector("#explore > details").open = false openFeature(...places.featuresByCategory[category]); }) } @@ -224,7 +223,6 @@ bindButtonToCategory(document.getElementById("explore-on-schedule"), "on-schedul bindButtonToCategory(document.getElementById("explore-dodo"), "dodo") bindButtonToCategory(document.getElementById("explore-bin"), "bin") bindButtonToCategory(document.getElementById("explore-toilets"), "toilets") -bindButtonToCategory(document.getElementById("explore-care"), "care") document.getElementById("logo").addEventListener("click", e => { openFeature() diff --git a/js/map.js b/js/map.js index a6afaac..c59032c 100644 --- a/js/map.js +++ b/js/map.js @@ -135,15 +135,9 @@ export async function init_places(places_db){ contentEl.append(nameEl) } - let classlist = ["highlight-point-icon"] - - if((!feature.parentFeature && feature.geometry.type == "Point") || feature.parentFeature?.geometry.type == "Point"){ - classlist.push("point-feature") - } - return L.marker(latlng, { icon: L.divIcon({ - className: classlist.join(" "), + className: "highlight-point-icon", html: contentEl, iconSize: [0, 0] }) diff --git a/js/places.js b/js/places.js index c587c14..a76902e 100644 --- a/js/places.js +++ b/js/places.js @@ -12,9 +12,8 @@ const CATEGORIES = { "drinking-water": (feature) => feature.properties["eau potable"] || feature.properties["douches"] || feature.properties["toilettes"], "bin": (feature) => feature.properties["poubelle"], "dodo": (feature) => feature.properties["n couchage"] > 0 || feature.properties["camping"], - "on-schedule": (feature) => feature.properties["pretalx-room-id"] || feature.properties["pretalx-room-id"] == 0 || feature.properties["village"], - "toilets": (feature) => feature.properties["toilettes"] || feature.properties["douches"], - "care": (feature) => feature.properties["medic"] || feature.properties["care"] + "on-schedule": (feature) => feature.properties["pretalx-room-id"] || feature.properties["pretalx-room-id"] == 0, + "toilets": (feature) => feature.properties["toilettes"] || feature.properties["douches"] } /** @@ -270,7 +269,6 @@ export class PlaceDatabase extends EventTarget { default_database.loadGeojson(new URL("../couches/eau-potable.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/espace-camp.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/espacemiam.geojson", import.meta.url), {batch: true}), - default_database.loadGeojson(new URL("../couches/installations-permanentes.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/marabouts.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/medic.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/parkings.geojson", import.meta.url), {batch: true}), diff --git a/js/symbols.js b/js/symbols.js index e20b9c1..87a8765 100644 --- a/js/symbols.js +++ b/js/symbols.js @@ -76,30 +76,10 @@ function getBaseSymbolForFeature(feature){ return STAGE_SYMBOL } - if(feature.properties["village"]){ - return VILLAGE_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 } - if(feature.properties["autogestion"] == "radio"){ - return RADIO_SYMBOL - } - if(feature.properties["dons"]){ return MONEY_SYMBOL } @@ -259,7 +239,6 @@ export const BADMINGTON_SYMBOL = new MapSymbol() export const MEDIC_SYMBOL = new MapSymbol() { MEDIC_SYMBOL.markerUrl = new URL("../icons/medic.svg", import.meta.url) - MEDIC_SYMBOL.genericName = "Médic" MEDIC_SYMBOL.borderColor = "white" MEDIC_SYMBOL.indexSynonyms = [ "medic", @@ -450,17 +429,6 @@ export const SHIFTS_SYMBOL = new MapSymbol() ] } -export const RADIO_SYMBOL = new MapSymbol() -{ - RADIO_SYMBOL.genericName = "Radio" - RADIO_SYMBOL.markerUrl = new URL("../icons/radio.svg", import.meta.url) - RADIO_SYMBOL.indexSynonyms = [ - "radio", - "fm", - "91.8", - ] -} - export const SCHEDULE_SYMBOL = new MapSymbol() { SCHEDULE_SYMBOL.genericName = "Programmation" @@ -482,60 +450,4 @@ 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é" - ] -} - -export const VILLAGE_SYMBOL = new MapSymbol() -{ - VILLAGE_SYMBOL.genericName = "Installation permanente" - VILLAGE_SYMBOL.markerUrl = new URL("../icons/default-marker.svg", import.meta.url) - VILLAGE_SYMBOL.backgroundColor = "white" - VILLAGE_SYMBOL.borderColor = "white" - VILLAGE_SYMBOL.indexSynonyms = [ - "village", - "installation" - ] } \ No newline at end of file diff --git a/map-light.qgz b/map-light.qgz index 1230263..bc0ffb2 100644 Binary files a/map-light.qgz and b/map-light.qgz differ