Styling tweak

Add mapillary link to nearby_images

Fix licenses

Add missing assets

First version of nearby-images
This commit is contained in:
Pieter Vander Vennet 2022-05-06 12:41:24 +02:00
parent a4f2fa63a5
commit 7559f9259b
52 changed files with 674 additions and 207 deletions

View file

@ -273,4 +273,4 @@
}
}
]
}
}

View file

@ -59,6 +59,18 @@
"id": "comment",
"render": "{add_note_comment()}"
},
{
"id": "nearby-images",
"render": {
"before": {
"en": "<h3>Nearby images</h3>The pictures below are nearby geotagged images and might be helpful to handle this note."
},
"special": {
"type": "nearby_images",
"mode": "open"
}
}
},
{
"id": "report-contributor",
"render": {

View file

@ -1,89 +0,0 @@
{
"id": "note_import",
"name": {
"en": "Possible bookcases",
"nl": "Mogelijke publieke boekenkastjes",
"de": "Mögliche Bücherschränke"
},
"description": "Template for note note imports.",
"source": {
"osmTags": {
"and": [
"id~*"
]
},
"geoJson": "https://api.openstreetmap.org/api/0.6/notes.json?closed=0&bbox={x_min},{y_min},{x_max},{y_max}",
"geoJsonZoomLevel": 12,
"maxCacheAge": 0
},
"minzoom": 10,
"title": {
"render": {
"en": "Possible feature",
"nl": "Mogelijk object",
"de": "Mögliches Objekt"
}
},
"calculatedTags": [
"_first_comment:=feat.get('comments')[0].text.toLowerCase()",
"_trigger_index:=(() => {const lines = feat.properties['_first_comment'].split('\\n'); const matchesMapCompleteURL = lines.map(l => l.match(\".*https://mapcomplete.osm.be/\\([a-zA-Z_-]+\\)\\(.html\\).*#import\")); const matchedIndexes = matchesMapCompleteURL.map((doesMatch, i) => [doesMatch !== null, i]).filter(v => v[0]).map(v => v[1]); return matchedIndexes[0] })()",
"_intro:=(() => {const lines = feat.properties['_first_comment'].split('\\n'); lines.splice(feat.get('_trigger_index')-1, lines.length); return lines.map(l => l == '' ? '<br/>' : l).join('');})()",
"_tags:=(() => {let lines = feat.properties['_first_comment'].split('\\n').map(l => l.trim()); lines.splice(0, feat.get('_trigger_index') + 1); lines = lines.filter(l => l != ''); return lines.join(';');})()"
],
"isShown": {
"render": "yes",
"mappings": [
{
"if": "_trigger_index=",
"then": "no"
}
]
},
"titleIcons": [
{
"render": "<a href='https://openstreetmap.org/note/{id}' target='_blank'><img src='./assets/svg/osm-logo-us.svg'></a>"
}
],
"tagRenderings": [
{
"id": "conversation",
"render": "{visualize_note_comments(comments,1)}"
},
{
"id": "Intro",
"render": "{_intro}"
},
{
"id": "import",
"render": "{import_button(public_bookcase, _tags, There might be a public bookcase here,./assets/svg/addSmall.svg,,,id)}"
},
{
"id": "close_note_",
"render": "{close_note(Does not exist<br/>, ./assets/svg/close.svg, id, This feature does not exist)}"
},
{
"id": "close_note_mapped",
"render": "{close_note(Already mapped, ./assets/svg/checkmark.svg, id, Already mapped)}"
},
{
"id": "comment",
"render": "{add_note_comment()}"
},
{
"id": "add_image",
"render": "{add_image_to_note()}"
}
],
"mapRendering": [
{
"location": [
"point",
"centroid"
],
"icon": {
"render": "teardrop:#3333cc"
},
"iconSize": "40,40,bottom"
}
]
}

37
assets/svg/confirm.svg Normal file
View file

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="157.33984"
height="157.33984"
viewBox="0 0 157.33984 157.33984"
version="1.1"
id="svg9"
sodipodi:docname="confirm.svg"
inkscape:version="1.1.2 (1:1.1+202202050950+0a00cf5339)"
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">
<defs
id="defs13" />
<sodipodi:namedview
id="namedview11"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:pageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
showgrid="false"
inkscape:zoom="2.312"
inkscape:cx="-18.598616"
inkscape:cy="57.093426"
inkscape:current-layer="svg9" />
<path
style="fill:#35d447;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 157.33984,78.66796 c 0,43.44922 -35.21875,78.67188 -78.66796,78.67188 C 35.22266,157.33984 0,122.11718 0,78.66796 0,35.22265 35.22266,0 78.67188,0 c 43.44921,0 78.66796,35.22265 78.66796,78.66796 z m 0,0"
id="path4" />
<path
style="fill:none;stroke:#ffffff;stroke-width:19.7495;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
d="m 37.69921,75.49609 35.55078,39.5 47.39844,-63.19922"
id="path6" />
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

View file

@ -239,6 +239,14 @@
"authors": [],
"sources": []
},
{
"path": "confirm.svg",
"license": "CC0",
"authors": [
"Pieter Vander Vennet"
],
"sources": []
},
{
"path": "copyright.svg",
"license": "CC0",
@ -1115,11 +1123,15 @@
},
{
"path": "search_disable.svg",
"license": "CC0",
"license": "MIT",
"authors": [
"OOjs UI Team and other contributors",
"Pieter Vander Vennet"
],
"sources": []
"sources": [
"https://commons.wikimedia.org/wiki/File:OOjs_UI_indicator_search-rtl.svg",
"https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/AUTHORS.txt"
]
},
{
"path": "send_email.svg",

View file

@ -4,7 +4,10 @@
"id": "questions"
},
"images": {
"render": "{image_carousel()}{image_upload()}"
"render": "{image_carousel()}{image_upload()}{nearby_images(expandable)}"
},
"mapillary": {
"render": "{mapillary()}"
},
"export_as_gpx": {
"render": "{export_as_gpx()}"
@ -36,7 +39,25 @@
{
"if": "wikipedia~*",
"then": {
"*": "{wikipedia():max-height:25rem}"
"*": "{wikipedia():max-height:25rem}",
"ca": "No hi ha cap enllaça a Viquipèdia encara",
"da": "Der er endnu ikke linket til nogen Wikipedia-side",
"de": "Es wurde noch keine Wikipedia-Seite verlinkt",
"en": "No Wikipedia page has been linked yet",
"es": "Todavía no se ha enlazado una página de wikipedia",
"fil": "Wala pang kawing ng Wikipedia page",
"fr": "Pas encore de lien vers une page Wikipedia",
"hu": "Még nincs Wikipédia-oldal belinkelve",
"it": "Nessuna pagina Wikipedia è ancora stata collegata",
"ja": "ウィキペディアのページはまだリンクされていません",
"nb_NO": "Ingen Wikipedia-side lenket enda",
"nl": "Er werd nog geen Wikipedia-pagina gekoppeld",
"pl": "Link do strony Wikipedii nie został jeszcze określony",
"pt": "Ainda não foi vinculada nenhuma página da Wikipédia",
"ru": "Никакой страницы на Википедии не было прикреплено",
"sv": "Ingen Wikipedia-sida har länkats än",
"zh_Hans": "尚未有连接到的维基百科页面",
"zh_Hant": "還沒有連結到維基百科頁面"
},
"hideInAnswer": true
},

View file

@ -1,13 +1,19 @@
{
"id": "mapcomplete-changes",
"title": {
"en": "Changes made with MapComplete"
"en": "Changes made with MapComplete",
"de": "Änderungen mit MapComplete",
"es": "Cambios hechos con MapComplete"
},
"shortDescription": {
"en": "Shows changes made by MapComplete"
"en": "Shows changes made by MapComplete",
"de": "Zeigt Änderungen von MapComplete",
"es": "Muestra los cambios hechos por MapComplete"
},
"description": {
"en": "This maps shows all the changes made with MapComplete"
"en": "This maps shows all the changes made with MapComplete",
"de": "Diese Karte zeigt alle Änderungen die mit MapComplete gemacht wurden",
"es": "Este mapa muestra todos los cambios hechos con MapComplete"
},
"maintainer": "",
"icon": "./assets/svg/logo.svg",
@ -22,7 +28,9 @@
{
"id": "mapcomplete-changes",
"name": {
"en": "Changeset centers"
"en": "Changeset centers",
"de": "Schwerpunkte von Änderungssätzen",
"es": "Centros de conjuntos de cambios"
},
"minzoom": 0,
"source": {
@ -36,35 +44,45 @@
],
"title": {
"render": {
"en": "Changeset for {theme}"
"en": "Changeset for {theme}",
"de": "Änderungen für {theme}",
"es": "Conjunto de cambios para {theme}"
}
},
"description": {
"en": "Shows all MapComplete changes"
"en": "Shows all MapComplete changes",
"de": "Zeigt alle MapComplete Änderungen",
"es": "Muestra todos los cambios de MapComplete"
},
"tagRenderings": [
{
"id": "render_id",
"render": {
"en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
"en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
"de": "Änderung <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
"es": "Conjunto de cambios <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
}
},
{
"id": "contributor",
"render": {
"en": "Change made by <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>"
"en": "Change made by <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>",
"de": "Änderung wurde von <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a> gemacht",
"es": "Cambio hecho por <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>"
}
},
{
"id": "theme",
"render": {
"en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
"en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
"de": "Änderung mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
},
"mappings": [
{
"if": "theme~http.*",
"then": {
"en": "Change with <b>unofficial</b> theme <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>"
"en": "Change with <b>unofficial</b> theme <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>",
"de": "Änderung mit <b>inoffiziellem</b> Thema <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>"
}
}
]
@ -332,7 +350,8 @@
}
],
"question": {
"en": "Themename contains {search}"
"en": "Themename contains {search}",
"de": "Themenname enthält {search}"
}
}
]
@ -348,7 +367,9 @@
}
],
"question": {
"en": "Made by contributor {search}"
"en": "Made by contributor {search}",
"de": "Erstellt von {search}",
"es": "Hecho por contributor/a {search}"
}
}
]
@ -364,7 +385,9 @@
}
],
"question": {
"en": "<b>Not</b> made by contributor {search}"
"en": "<b>Not</b> made by contributor {search}",
"de": "<b>Nicht</b> erstellt von {search}",
"es": "<b>No</b> hecho por contributor/a {search}"
}
}
]
@ -379,7 +402,9 @@
{
"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>"
"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 finden Sie <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>",
"es": "Se pueden encontrar más estadísticas <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>aquí</a>"
}
},
{