diff --git a/Models/Constants.ts b/Models/Constants.ts index ccf8e1c7f..0234c1270 100644 --- a/Models/Constants.ts +++ b/Models/Constants.ts @@ -2,7 +2,7 @@ import { Utils } from "../Utils"; export default class Constants { - public static vNumber = "0.7.0b"; + public static vNumber = "0.7.0c"; // The user journey states thresholds when a new feature gets unlocked public static userJourney = { diff --git a/assets/layers/play_forest/play_forest.json b/assets/layers/play_forest/play_forest.json index 8c9174a0d..eed73151f 100644 --- a/assets/layers/play_forest/play_forest.json +++ b/assets/layers/play_forest/play_forest.json @@ -99,7 +99,7 @@ "render": "40,40,center" }, "color": { - "render": "#2d2" + "render": "#007055" }, "presets": [ { diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json index e449ea4a3..b826c78ac 100644 --- a/assets/layers/playground/playground.json +++ b/assets/layers/playground/playground.json @@ -355,7 +355,7 @@ ] }, "color": { - "render": "#0c3" + "render": "#5dbaa9" }, "presets": [ { diff --git a/assets/layers/sport_pitch/baseball.svg b/assets/layers/sport_pitch/baseball.svg index 81f47c079..b877130be 100644 --- a/assets/layers/sport_pitch/baseball.svg +++ b/assets/layers/sport_pitch/baseball.svg @@ -7,12 +7,12 @@ 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" - width="50.01" - height="50.01" - viewBox="0 0 300 300" + width="28.722986" + height="28.551975" + viewBox="0 0 172.30346 171.2776" version="1.1" id="svg8" - sodipodi:docname="baseball.svg" + sodipodi:docname="Basebal.svg" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"> @@ -34,23 +34,23 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1039" + inkscape:window-width="640" + inkscape:window-height="480" id="namedview10" showgrid="false" inkscape:zoom="4.7190563" - inkscape:cx="25.004999" - inkscape:cy="25.004999" + inkscape:cx="14.208312" + inkscape:cy="14.303812" inkscape:window-x="0" inkscape:window-y="0" - inkscape:window-maximized="1" + inkscape:window-maximized="0" inkscape:current-layer="svg8" /> + style="fill:#7cb82f;fill-rule:evenodd" /> + style="fill-rule:evenodd" /> diff --git a/assets/layers/sport_pitch/beachvolleyball.svg b/assets/layers/sport_pitch/beachvolleyball.svg index a4168cd35..eca3f71a2 100644 --- a/assets/layers/sport_pitch/beachvolleyball.svg +++ b/assets/layers/sport_pitch/beachvolleyball.svg @@ -7,15 +7,15 @@ 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" - width="50.01" - height="50.01" - viewBox="0 0 300 300" + width="28.91189" + height="28.864483" + viewBox="0 0 173.43666 173.15227" version="1.1" - id="svg32" - sodipodi:docname="beachvolleyball.svg" + id="svg97" + sodipodi:docname="Volleybal.svg" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"> + id="metadata101"> @@ -35,22 +35,22 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" - inkscape:window-height="1039" - id="namedview34" + inkscape:window-height="999" + id="namedview99" showgrid="false" inkscape:zoom="4.7190563" - inkscape:cx="25.004999" - inkscape:cy="25.004999" + inkscape:cx="-28.848676" + inkscape:cy="14.503471" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" - inkscape:current-layer="svg32" /> + inkscape:current-layer="svg97" /> + id="defs93"> + style="fill:#7cb82f;fill-rule:evenodd" /> + style="fill-rule:evenodd" /> diff --git a/assets/layers/sport_pitch/boules.svg b/assets/layers/sport_pitch/boules.svg index 038d0bd46..55639687d 100644 --- a/assets/layers/sport_pitch/boules.svg +++ b/assets/layers/sport_pitch/boules.svg @@ -7,15 +7,15 @@ 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" - width="50.01" - height="50.01" - viewBox="0 0 300 300" + width="30.611471" + height="30.281755" + viewBox="0 0 183.63211 181.65421" version="1.1" - id="svg46" - sodipodi:docname="boules.svg" + id="svg34" + sodipodi:docname="Petanque.svg" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"> + id="metadata38"> @@ -35,22 +35,22 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" - inkscape:window-height="1039" - id="namedview48" + inkscape:window-height="999" + id="namedview36" showgrid="false" inkscape:zoom="4.7190563" - inkscape:cx="-18.223982" - inkscape:cy="25.004999" + inkscape:cx="15.883372" + inkscape:cy="15.326143" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" - inkscape:current-layer="svg46" /> + inkscape:current-layer="svg34" /> + id="defs28"> + style="fill:#7cb82f;fill-rule:evenodd" /> + style="fill:#7cb82f;fill-rule:evenodd" /> + style="fill:#7cb82f;fill-rule:evenodd" /> + style="fill-rule:evenodd" /> diff --git a/assets/layers/sport_pitch/license_info.json b/assets/layers/sport_pitch/license_info.json index ee47902a9..318c977d3 100644 --- a/assets/layers/sport_pitch/license_info.json +++ b/assets/layers/sport_pitch/license_info.json @@ -10,6 +10,28 @@ "https://www.provincieantwerpen.be/" ] }, + { + "authors": [ + "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " + ], + "path": "lock.svg", + "license": "CC-BY-SA 4.0", + "sources": [ + "https://createlli.com/", + "https://www.provincieantwerpen.be/" + ] + }, + { + "authors": [ + "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " + ], + "path": "sport_pitch.svg", + "license": "CC-BY-SA 4.0", + "sources": [ + "https://createlli.com/", + "https://www.provincieantwerpen.be/" + ] + }, { "authors": [ "Gitte Loos (Createlli) in opdracht van Provincie Antwerpen " diff --git a/assets/layers/sport_pitch/lock.svg b/assets/layers/sport_pitch/lock.svg new file mode 100644 index 000000000..55d9159f0 --- /dev/null +++ b/assets/layers/sport_pitch/lock.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/assets/layers/sport_pitch/skateboard.svg b/assets/layers/sport_pitch/skateboard.svg index 4c4829cfb..0797e808f 100644 --- a/assets/layers/sport_pitch/skateboard.svg +++ b/assets/layers/sport_pitch/skateboard.svg @@ -7,15 +7,15 @@ 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" - width="50.01" - height="50.01" - viewBox="0 0 300 300" + width="29.035688" + height="29.225443" + viewBox="0 0 174.1793 175.3176" version="1.1" - id="svg9" - sodipodi:docname="skateboard.svg" + id="svg60" + sodipodi:docname="Skateboard.svg" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"> + id="metadata64"> @@ -36,21 +36,21 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview11" + id="namedview62" showgrid="false" inkscape:zoom="4.7190563" - inkscape:cx="25.004999" - inkscape:cy="25.004999" + inkscape:cx="15.328474" + inkscape:cy="14.386902" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="0" - inkscape:current-layer="svg9" /> + inkscape:current-layer="svg60" /> + id="defs55"> + style="fill:#7cb82f;fill-rule:evenodd" /> + style="fill:#7cb82f;fill-rule:evenodd" /> + style="fill-rule:evenodd" /> diff --git a/assets/layers/sport_pitch/soccer.svg b/assets/layers/sport_pitch/soccer.svg index b86747c39..92d141251 100644 --- a/assets/layers/sport_pitch/soccer.svg +++ b/assets/layers/sport_pitch/soccer.svg @@ -7,15 +7,15 @@ 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" - width="50.01" - height="50.01" - viewBox="0 0 300 300" + width="28.644648" + height="28.638714" + viewBox="0 0 171.83352 171.79793" version="1.1" - id="svg21" - sodipodi:docname="soccer.svg" + id="svg85" + sodipodi:docname="Voetbal.svg" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"> + id="metadata89"> @@ -36,21 +36,21 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview23" + id="namedview87" showgrid="false" inkscape:zoom="4.7190563" - inkscape:cx="25.004999" - inkscape:cy="25.004999" + inkscape:cx="14.141483" + inkscape:cy="14.306682" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="0" - inkscape:current-layer="svg21" /> + inkscape:current-layer="svg85" /> + id="defs81"> + style="fill:#7cb82f;fill-rule:evenodd" /> + style="fill-rule:evenodd" /> diff --git a/assets/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json index 90e473bfd..d37d022e6 100644 --- a/assets/layers/sport_pitch/sport_pitch.json +++ b/assets/layers/sport_pitch/sport_pitch.json @@ -295,7 +295,7 @@ ], "hideUnderlayingFeaturesMinPercentage": 0, "icon": { - "render": "circle:white;./assets/layers/sport_pitch/basketball.svg", + "render": "circle:white;./assets/layers/sport_pitch/sport_pitch.svg", "mappings": [ { "if": { @@ -325,6 +325,16 @@ }, "then": "isOpen", "badge": true + }, + { + "if": { + "or": [ + "access=customers", + "access=private", + "access=no" + ] + }, + "then": "circle:white;./assets/layers/sport_pitch/lock.svg" } ], "width": { @@ -351,7 +361,7 @@ ] }, "color": { - "render": "#009" + "render": "#7cb82f" }, "presets": [ { diff --git a/assets/layers/sport_pitch/sport_pitch.svg b/assets/layers/sport_pitch/sport_pitch.svg new file mode 100644 index 000000000..01298ec95 --- /dev/null +++ b/assets/layers/sport_pitch/sport_pitch.svg @@ -0,0 +1,15 @@ + + + + + + + diff --git a/assets/layers/sport_pitch/table_tennis.svg b/assets/layers/sport_pitch/table_tennis.svg index 22a2ac29d..938aa318f 100644 --- a/assets/layers/sport_pitch/table_tennis.svg +++ b/assets/layers/sport_pitch/table_tennis.svg @@ -7,15 +7,15 @@ 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" - width="50.01" - height="50.01" - viewBox="0 0 300 300" + width="29.729809" + height="30.035646" + viewBox="0 0 178.34319 180.17785" version="1.1" - id="svg33" - sodipodi:docname="table_tennis.svg" + id="svg47" + sodipodi:docname="Pingpong.svg" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"> + id="metadata51"> @@ -36,21 +36,21 @@ inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" - id="namedview35" + id="namedview49" showgrid="false" inkscape:zoom="4.7190563" - inkscape:cx="25.004999" - inkscape:cy="25.004999" + inkscape:cx="15.336399" + inkscape:cy="14.6696" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="0" - inkscape:current-layer="svg33" /> + inkscape:current-layer="svg47" /> + id="defs42"> + style="fill:#7cb82f;fill-rule:evenodd" /> + style="fill:#7cb82f;fill-rule:evenodd" /> + diff --git a/assets/layers/sport_pitch/tennis.svg b/assets/layers/sport_pitch/tennis.svg index d7b5e12bd..66320ab2e 100644 --- a/assets/layers/sport_pitch/tennis.svg +++ b/assets/layers/sport_pitch/tennis.svg @@ -7,15 +7,15 @@ 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" - width="50.01" - height="50.01" - viewBox="0 0 300 300" + width="28.820026" + height="29.006948" + viewBox="0 0 172.88559 174.0069" version="1.1" - id="svg46" - sodipodi:docname="tennis.svg" + id="svg73" + sodipodi:docname="Tennis.svg" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"> + id="metadata77"> @@ -34,23 +34,23 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1039" - id="namedview48" + inkscape:window-width="640" + inkscape:window-height="480" + id="namedview75" showgrid="false" - inkscape:zoom="9.4381127" - inkscape:cx="24.06683" - inkscape:cy="10.703119" + inkscape:zoom="4.7190563" + inkscape:cx="14.6696" + inkscape:cy="14.3362" inkscape:window-x="0" inkscape:window-y="0" - inkscape:window-maximized="1" - inkscape:current-layer="svg46" /> + inkscape:window-maximized="0" + inkscape:current-layer="svg73" /> + id="defs68"> + style="fill:#7cb82f;fill-rule:evenodd" /> + style="fill:#7cb82f;fill-rule:evenodd" /> + style="fill-rule:evenodd" /> diff --git a/assets/layers/sport_pitch/volleyball.svg b/assets/layers/sport_pitch/volleyball.svg index a4168cd35..eca3f71a2 100644 --- a/assets/layers/sport_pitch/volleyball.svg +++ b/assets/layers/sport_pitch/volleyball.svg @@ -7,15 +7,15 @@ 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" - width="50.01" - height="50.01" - viewBox="0 0 300 300" + width="28.91189" + height="28.864483" + viewBox="0 0 173.43666 173.15227" version="1.1" - id="svg32" - sodipodi:docname="beachvolleyball.svg" + id="svg97" + sodipodi:docname="Volleybal.svg" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"> + id="metadata101"> @@ -35,22 +35,22 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" - inkscape:window-height="1039" - id="namedview34" + inkscape:window-height="999" + id="namedview99" showgrid="false" inkscape:zoom="4.7190563" - inkscape:cx="25.004999" - inkscape:cy="25.004999" + inkscape:cx="-28.848676" + inkscape:cy="14.503471" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" - inkscape:current-layer="svg32" /> + inkscape:current-layer="svg97" /> + id="defs93"> + style="fill:#7cb82f;fill-rule:evenodd" /> + style="fill-rule:evenodd" /> diff --git a/assets/layers/village_green/village_green.json b/assets/layers/village_green/village_green.json index e339dbf81..02dc02293 100644 --- a/assets/layers/village_green/village_green.json +++ b/assets/layers/village_green/village_green.json @@ -23,7 +23,7 @@ "icon": "./assets/themes/playgrounds/playground.svg", "iconSize": "40,40,center", "width": "1", - "color": "#0f0", + "color": "#937f20", "wayHandling": 2, "tagRenderings": [ "images", diff --git a/assets/themes/buurtnatuur/license_info.json b/assets/themes/buurtnatuur/license_info.json index 83a40d025..9719faeea 100644 --- a/assets/themes/buurtnatuur/license_info.json +++ b/assets/themes/buurtnatuur/license_info.json @@ -65,8 +65,6 @@ ], "path": "social_image.jpg", "license": "All rights reserved", - "sources": [ - "" - ] + "sources": [] } ] \ No newline at end of file