contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Feature: allow to move and snap to a layer, fix #2120

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-09-04 00:07:23 +02:00
parent eb89427bfc
commit fdedb75954
34 changed files with 824 additions and 301 deletions
Download patch file Download diff file Expand all files Collapse all files

3
assets/layers/climbing_opportunity/climbing_opportunity.json
View file

@ -34,6 +34,9 @@
]
}
},
"snapName": {
"en": "a wall, cliff or rock"
},
"minzoom": 18,
"title": {
"render": {

4
assets/layers/cycleways_and_roads/cycleways_and_roads.json
View file

@ -9,6 +9,10 @@
"ca": "Vies ciclistes i carreteres",
"cs": "Cyklostezky a silnice"
},
"snapName": {
"en": "a road or a cycleway",
"nl": "een weg, straat of fietspad"
},
"description": {
"en": "All infrastructure that someone can cycle over, accompanied with questions about this infrastructure",
"nl": "Alle infrastructuur waar je over kunt fietsen, met vragen over die infrastructuur",

4
assets/layers/indoors/indoors.json
View file

@ -8,6 +8,10 @@
"ca": "Interiors",
"cs": "Vnitřní prostory"
},
"snapName": {
"en": "an indoor wall",
"nl": "een binnenmuur"
},
"description": {
"en": "Basic indoor mapping: shows room outlines",
"de": "Grundlegende Innenraumkartierung: zeigt Umrisse von Räumen",

3
assets/layers/kerbs/kerbs.json
View file

@ -11,6 +11,9 @@
"ca": "Vroades",
"cs": "Obrubníky"
},
"snapName": {
"en": "a kerb"
},
"description": {
"en": "A layer showing kerbs.",
"nl": "Een laag met stoepranden.",

3
assets/layers/pedestrian_path/pedestrian_path.json
View file

@ -8,6 +8,9 @@
"ca": "Camins per a vianants",
"cs": "Cesty pro chodce"
},
"snapName": {
"en": "a pedestrian path"
},
"description": {
"en": "Pedestrian footpaths, especially used for indoor navigation and snapping entrances to this layer",
"nl": "Pad voor voetgangers, in het bijzonder gebruikt voor navigatie binnen gebouwen en om aan toegangen vast te klikken in deze laag",

3
assets/layers/shelter/shelter.json
View file

@ -8,6 +8,9 @@
"fr": "Abri",
"cs": "Přístřešek"
},
"snapName": {
"en": "a shelter"
},
"description": {
"en": "Layer showing shelter structures",
"de": "Eine Ebene, die verschiedene Bauformen von Unterständen zeigt",

4
assets/layers/walls_and_buildings/walls_and_buildings.json
View file

@ -12,6 +12,10 @@
"zh_Hant": "特殊的內建圖層顯示所有牆壁與建築。這個圖層對於規畫要靠牆的東西 (例如 AED、郵筒、入口、地址、監視器等) 相當實用。這個圖層預設顯示而且無法由使用者開關。",
"pl": "Specjalna warstwa zabudowana zapewniająca wszystkie mury i budynki. Warstwa ta jest przydatna w ustawieniach wstępnych obiektów, które można umieścić przy ścianach (np. AED, skrzynki pocztowe, wejścia, adresy, kamery monitorujące itp.). Warstwa ta jest domyślnie niewidoczna i użytkownik nie może jej przełączać."
},
"snapName": {
"en": "a wall or building",
"nl": "een muur of gebouw"
},
"source": {
"osmTags": {
"or": [

16
assets/svg/license_info.json
View file

@ -1065,6 +1065,14 @@
"https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/AUTHORS.txt"
]
},
{
"path": "snap.svg",
"license": "CC0-1.0",
"authors": [
"Pieter Vander Vennet"
],
"sources": []
},
{
"path": "speech_bubble.svg",
"license": "CC-BY-4.0",
@ -1203,6 +1211,14 @@
],
"sources": []
},
{
"path": "unsnap.svg",
"license": "CC0-1.0",
"authors": [
"Pieter Vander Vennet"
],
"sources": []
},
{
"path": "wikidata.svg",
"license": "LOGO",

84
assets/svg/snap.svg Normal file
View file

@ -0,0 +1,84 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="120"
height="120"
viewBox="0 0 120 120"
version="1.1"
id="svg1"
xml:space="preserve"
inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
sodipodi:docname="snap.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
id="namedview1"
pagecolor="#ffffff"
bordercolor="#999999"
borderopacity="1"
inkscape:showpageshadow="2"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showguides="true"
inkscape:zoom="4.5168066"
inkscape:cx="40.51535"
inkscape:cy="42.39721"
inkscape:window-width="1920"
inkscape:window-height="995"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1"><sodipodi:guide
position="315.49944,61.936443"
orientation="0,-1"
id="guide2"
inkscape:locked="false" /></sodipodi:namedview><defs
id="defs1" /><g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-5,-5)"><path
id="path1-2"
style="fill:#808080;fill-opacity:1;stroke-width:3.93092"
d="m 72.294942,72.07284 c 0.948679,-0.909931 1.380066,-2.234124 1.148907,-3.527969 L 69.995854,51.284128 C 69.614243,49.146951 67.469637,47.282834 65.914649,48.798037 L 59.882054,54.677556 44.886208,39.828561 c -1.383257,-1.369713 -3.807955,-0.909932 -4.298111,-0.288099 -1.707154,2.165786 -0.138139,3.968458 0.177549,4.304093 l 14.45874,15.372473 -6.032604,5.879513 c -1.554665,1.51554 0.253754,3.707343 2.380393,4.143751 l 17.16644,3.89041 c 1.287478,0.264342 2.622313,-0.132882 3.556328,-1.057866 z"
sodipodi:nodetypes="cccccsssccccc" /><g
id="g8" /><g
id="g10"
transform="rotate(-175.99037,61.199753,60.156378)"><g
id="path1"
inkscape:transform-center-x="1.8238832"
inkscape:transform-center-y="31.570993"><path
style="color:#000000;fill:#000000;stroke-linecap:round;-inkscape-stroke:none"
d="M 10,90 45,10"
id="path3" /><path
id="path4"
style="color:#000000;fill:#000009;stroke-linecap:round;-inkscape-stroke:none"
d="M 45.097656,5.0019531 A 5,5 0 0 0 43.177734,5.34375 5,5 0 0 0 40.419922,7.9960938 L 35.865234,18.40625 c 3.405007,0.669609 6.469474,2.331825 8.867188,4.679688 L 49.580078,12.003906 A 5,5 0 0 0 47.003906,5.4199219 5,5 0 0 0 45.097656,5.0019531 Z M 22.177734,49.691406 5.4199219,87.996094 a 5,5 0 0 0 2.5761719,6.583984 5,5 0 0 0 6.5839842,-2.576172 L 31.621094,53.052734 c -3.513941,-0.175553 -6.76611,-1.396873 -9.44336,-3.361328 z" /></g><path
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-opacity:1"
id="path9"
sodipodi:type="arc"
sodipodi:cx="32.616085"
sodipodi:cy="35.55938"
sodipodi:rx="12.741771"
sodipodi:ry="12.741771"
sodipodi:start="0"
sodipodi:end="6.26046"
sodipodi:open="true"
sodipodi:arc-type="arc"
d="M 45.357856,35.55938 A 12.741771,12.741771 0 0 1 32.688475,48.300945 12.741771,12.741771 0 0 1 19.875137,35.704157 12.741771,12.741771 0 0 1 32.398925,22.81946 12.741771,12.741771 0 0 1 45.354566,35.269844" /></g><path
style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-opacity:1"
id="path10"
sodipodi:type="arc"
sodipodi:cx="26.067774"
sodipodi:cy="26.136267"
sodipodi:rx="12.741771"
sodipodi:ry="12.741771"
sodipodi:start="0"
sodipodi:end="6.26046"
sodipodi:open="true"
sodipodi:arc-type="arc"
d="M 38.809545,26.136267 A 12.741771,12.741771 0 0 1 26.140164,38.877832 12.741771,12.741771 0 0 1 13.326826,26.281044 12.741771,12.741771 0 0 1 25.850614,13.396347 12.741771,12.741771 0 0 1 38.806255,25.846731" /></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 4.2 KiB

2
assets/svg/snap.svg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Pieter Vander Vennet
SPDX-License-Identifier: CC0-1.0

83
assets/svg/unsnap.svg Normal file
View file

@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="120"
height="120"
viewBox="0 0 120 120"
version="1.1"
id="svg1"
xml:space="preserve"
inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
sodipodi:docname="unsnap.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
id="namedview1"
pagecolor="#ffffff"
bordercolor="#999999"
borderopacity="1"
inkscape:showpageshadow="2"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showguides="true"
inkscape:zoom="4.5168066"
inkscape:cx="51.695815"
inkscape:cy="69.186048"
inkscape:window-width="1920"
inkscape:window-height="995"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1"><sodipodi:guide
position="315.49944,61.936443"
orientation="0,-1"
id="guide2"
inkscape:locked="false" /></sodipodi:namedview><defs
id="defs1" /><g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-5,-5)"><path
id="path1-2"
style="fill:#000000;fill-opacity:1;stroke-width:3.93092"
d="m 91.670867,40.074491 c 0.948679,0.909931 1.380066,2.234124 1.148907,3.527969 l -3.447995,17.260743 c -0.381611,2.137177 -2.526217,4.001294 -4.081205,2.486091 L 79.257979,57.469775 64.262133,72.31877 c -1.383257,1.369713 -3.807955,0.909932 -4.298111,0.288099 -1.707154,-2.165786 -0.138139,-3.968458 0.177549,-4.304093 L 74.600311,52.930303 68.567707,47.05079 c -1.554665,-1.51554 0.253754,-3.707343 2.380393,-4.143751 l 17.16644,-3.89041 c 1.287478,-0.264342 2.622313,0.132882 3.556328,1.057866 z"
sodipodi:nodetypes="cccccsssccccc" /><g
id="g8"
transform="matrix(-1,0,0,1,132.686,0)" /><g
id="g10"
transform="matrix(0.99755231,-0.06992414,-0.06992414,-0.99755231,14.642674,124.44485)"><path
style="color:#000000;fill:#000000;stroke-linecap:round;-inkscape-stroke:none"
d="M 10,90 45,10"
id="path3" /><path
id="path4"
style="color:#000000;fill:#808080;stroke-linecap:round;-inkscape-stroke:none;stroke:none;stroke-opacity:1;fill-opacity:1"
d="M 45.097656,5.0019531 A 5,5 0 0 0 43.177734,5.34375 5,5 0 0 0 40.419922,7.9960938 L 35.865234,18.40625 c 3.405007,0.669609 6.469474,2.331825 8.867188,4.679688 L 49.580078,12.003906 A 5,5 0 0 0 47.003906,5.4199219 5,5 0 0 0 45.097656,5.0019531 Z M 22.177734,49.691406 5.4199219,87.996094 a 5,5 0 0 0 2.5761719,6.583984 5,5 0 0 0 6.5839842,-2.576172 L 31.621094,53.052734 c -3.513941,-0.175553 -6.76611,-1.396873 -9.44336,-3.361328 z" /><path
style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-opacity:1"
id="path9"
sodipodi:type="arc"
sodipodi:cx="32.616085"
sodipodi:cy="35.55938"
sodipodi:rx="12.741771"
sodipodi:ry="12.741771"
sodipodi:start="0"
sodipodi:end="6.26046"
sodipodi:open="true"
sodipodi:arc-type="arc"
d="M 45.357856,35.55938 A 12.741771,12.741771 0 0 1 32.688475,48.300945 12.741771,12.741771 0 0 1 19.875137,35.704157 12.741771,12.741771 0 0 1 32.398925,22.81946 12.741771,12.741771 0 0 1 45.354566,35.269844" /></g><path
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-opacity:1"
id="path10"
sodipodi:type="arc"
sodipodi:cx="-106.61823"
sodipodi:cy="26.136267"
sodipodi:rx="12.741771"
sodipodi:ry="12.741771"
sodipodi:start="0"
sodipodi:end="6.26046"
sodipodi:open="true"
sodipodi:arc-type="arc"
d="m -93.876462,26.136267 a 12.741771,12.741771 0 0 1 -12.669378,12.741565 12.741771,12.741771 0 0 1 -12.81334,-12.596788 12.741771,12.741771 0 0 1 12.52379,-12.884697 12.741771,12.741771 0 0 1 12.955638,12.450384"
transform="scale(-1,1)" /></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 4.2 KiB

2
assets/svg/unsnap.svg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Pieter Vander Vennet
SPDX-License-Identifier: CC0

93
assets/themes/mapcomplete-changes/mapcomplete-changes.json
View file

@ -1,16 +1,13 @@
{
"id": "mapcomplete-changes",
"title": {
"en": "Changes made with MapComplete",
"de": "Änderungen mit MapComplete vorgenommen"
},
"description": {
"en": "This maps shows all the changes made with MapComplete",
"de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen"
"en": "Changes made with MapComplete"
},
"shortDescription": {
"en": "Shows changes made by MapComplete",
"de": "Änderungen von MapComplete anzeigen"
"en": "Shows changes made by MapComplete"
},
"description": {
"en": "This maps shows all the changes made with MapComplete"
},
"icon": "./assets/svg/logo.svg",
"hideFromOverview": true,
@ -21,8 +18,7 @@
{
"id": "mapcomplete-changes",
"name": {
"en": "Changeset centers",
"de": "Zentrum der Änderungssätze"
"en": "Changeset centers"
},
"minzoom": 0,
"source": {
@ -32,48 +28,41 @@
},
"title": {
"render": {
"en": "Changeset for {theme}",
"de": "Änderungssatz für {theme}"
"en": "Changeset for {theme}"
}
},
"description": {
"en": "Shows all MapComplete changes",
"de": "Zeigt alle MapComplete-Änderungen"
"en": "Shows all MapComplete changes"
},
"tagRenderings": [
{
"id": "show_changeset_id",
"render": {
"en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
"de": "Änderungssatz <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
"en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
}
},
{
"id": "contributor",
"question": {
"en": "What contributor did make this change?",
"de": "Wer hat diese Änderung vorgenommen?"
"en": "What contributor did make this change?"
},
"freeform": {
"key": "user"
},
"render": {
"en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>",
"de": "Änderung von <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
"en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
}
},
{
"id": "theme-id",
"question": {
"en": "What theme was used to make this change?",
"de": "Welches Thema wurde für die Änderung verwendet?"
"en": "What theme was used to make this change?"
},
"freeform": {
"key": "theme"
},
"render": {
"en": "Change with theme <a href='https://mapcomplete.org/{theme}'>{theme}</a>",
"de": "Änderung mit Thema <a href='https://mapcomplete.org/{theme}'>{theme}</a>"
"en": "Change with theme <a href='https://mapcomplete.org/{theme}'>{theme}</a>"
}
},
{
@ -82,23 +71,19 @@
"key": "locale"
},
"question": {
"en": "What locale (language) was this change made in?",
"de": "In welcher Benutzersprache wurde die Änderung vorgenommen?"
"en": "What locale (language) was this change made in?"
},
"render": {
"en": "User locale is {locale}",
"de": "Benutzersprache ist {locale}"
"en": "User locale is {locale}"
}
},
{
"id": "host",
"render": {
"en": "Change with with <a href='{host}'>{host}</a>",
"de": "Änderung mit <a href='{host}'>{host}</a>"
"en": "Change with with <a href='{host}'>{host}</a>"
},
"question": {
"en": "What host (website) was this change made with?",
"de": "Mit welchem Host (Website) wurde diese Änderung vorgenommen?"
"en": "What host (website) was this change made with?"
},
"freeform": {
"key": "host"
@ -119,12 +104,10 @@
{
"id": "version",
"question": {
"en": "What version of MapComplete was used to make this change?",
"de": "Welche Version von MapComplete wurde für diese Änderung verwendet?"
"en": "What version of MapComplete was used to make this change?"
},
"render": {
"en": "Made with {editor}",
"de": "Erstellt mit {editor}"
"en": "Made with {editor}"
},
"freeform": {
"key": "editor"
@ -522,8 +505,7 @@
}
],
"question": {
"en": "Themename contains {search}",
"de": "Themename enthält {search}"
"en": "Themename contains {search}"
}
}
]
@ -539,8 +521,7 @@
}
],
"question": {
"en": "Themename does <b>not</b> contain {search}",
"de": "Themenname enthält <b>nicht</b> {search}"
"en": "Themename does <b>not</b> contain {search}"
}
}
]
@ -556,8 +537,7 @@
}
],
"question": {
"en": "Made by contributor {search}",
"de": "Der Name enthält <b>nicht</b> {search}"
"en": "Made by contributor {search}"
}
}
]
@ -573,8 +553,7 @@
}
],
"question": {
"en": "<b>Not</b> made by contributor {search}",
"de": "<b>Nicht</b> erstellt von Mitwirkendem {search}"
"en": "<b>Not</b> made by contributor {search}"
}
}
]
@ -591,8 +570,7 @@
}
],
"question": {
"en": "Made before {search}",
"de": "Erstellt nach {search}"
"en": "Made before {search}"
}
}
]
@ -609,8 +587,7 @@
}
],
"question": {
"en": "Made after {search}",
"de": "Erstellt nach {search}"
"en": "Made after {search}"
}
}
]
@ -626,8 +603,7 @@
}
],
"question": {
"en": "User language (iso-code) {search}",
"de": "Benutzersprache (ISO-Code) {search}"
"en": "User language (iso-code) {search}"
}
}
]
@ -643,8 +619,7 @@
}
],
"question": {
"en": "Made with host {search}",
"de": "Erstellt mit Host {search}"
"en": "Made with host {search}"
}
}
]
@ -655,8 +630,7 @@
{
"osmTags": "add-image>0",
"question": {
"en": "Changeset added at least one image",
"de": "Änderungssatz fügte mindestens ein Bild hinzu"
"en": "Changeset added at least one image"
}
}
]
@ -667,8 +641,7 @@
{
"osmTags": "theme!=grb",
"question": {
"en": "Exclude GRB theme",
"de": "GRB-Thema ausschließen"
"en": "Exclude GRB theme"
}
}
]
@ -679,8 +652,7 @@
{
"osmTags": "theme!=etymology",
"question": {
"en": "Exclude etymology theme",
"de": "Etymologie-Thema ausschließen"
"en": "Exclude etymology theme"
}
}
]
@ -695,8 +667,7 @@
{
"id": "link_to_more",
"render": {
"en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>",
"de": "Weitere Statistiken findest du <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>"
"en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>"
}
},
{
@ -730,4 +701,4 @@
}
}
]
}
}

1
assets/themes/postal_codes/postal_codes.json
View file

@ -166,7 +166,6 @@
}
],
"allowMove": false
},
{
"id": "town_hall",

1
assets/themes/street_lighting/street_lighting.json
View file

@ -370,7 +370,6 @@
}
],
"allowMove": false
}
]
}

1
assets/themes/uk_addresses/uk_addresses.json
View file

@ -686,7 +686,6 @@
"enableImproveAccuraccy": true,
"enableRelocation": false
}
},
"named_streets"
],