mirror of
https://forge.chapril.org/tykayn/osm-commerces
synced 2025-06-20 01:44:42 +02:00
ajout propriétés de rue et siret aux lieux, champs en plus après envoi
This commit is contained in:
Tykayn
tykayn
parent
b9257d34fd
commit
3ccfd732e7
17 changed files with 361 additions and 56 deletions
|
|
@ -8,7 +8,12 @@
|
|||
<div id="map" style="height: 600px;"></div>
|
||||
<div class="mt-3">
|
||||
<button id="openInJOSM" class="btn btn-primary">Ouvrir dans JOSM</button>
|
||||
<a href="#" id="viewInPanoramax" class="btn btn-secondary" target="_blank">Voir dans Panoramax</a>
|
||||
<a href="#" id="viewInPanoramax" class="btn btn-secondary" >Voir dans Panoramax</a>
|
||||
</div>
|
||||
<div class="mt-3">
|
||||
<a href="{{ path('app_public_set_opted_out_place', {'uuid': place.uuidForUrl}) }}" class="btn btn-danger">
|
||||
Ne plus me rappeler de vérifier les informations de ce lieu par email ou tout autre moyen
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -84,6 +84,16 @@
|
|||
<i class="bi bi-load bi-spin"></i>
|
||||
<span class="visually-hidden">Chargement de la carte...</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="d-flex justify-content-end mb-2">
|
||||
<div class="btn-group" role="group">
|
||||
<button type="button" class="btn btn-outline-primary active" id="circleMarkersBtn">
|
||||
<i class="bi bi-circle"></i> Cercles
|
||||
</button>
|
||||
<button type="button" class="btn btn-outline-primary" id="dropMarkersBtn">
|
||||
<i class="bi bi-geo-alt"></i> Gouttes
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div id="map" class="mt-4" style="height: 400px;"></div>
|
||||
<div id="attribution">
|
||||
|
|
|
|||
|
|
@ -47,13 +47,16 @@
|
|||
{{ commerce.mainTag }}
|
||||
</a>
|
||||
</td>
|
||||
<td class="{{ commerce.hasAddress() ? 'filled' : '' }}">{{ commerce.address }}</td>
|
||||
<td class="{{ commerce.hasAddress() ? 'filled' : '' }}">{{ commerce.address }} </td>
|
||||
<td class="{{ commerce.hasAddress() ? 'filled' : '' }}">{{ commerce.housenumber }}</td>
|
||||
<td class="{{ commerce.hasAddress() ? 'filled' : '' }}">{{ commerce.street }}</td>
|
||||
<td class="{{ commerce.hasWebsite() ? 'filled' : '' }}">{{ commerce.website }}</td>
|
||||
<td class="{{ commerce.hasWheelchair() ? 'filled' : '' }}">{{ commerce.wheelchair }}</td>
|
||||
<td class="{{ commerce.hasNote() ? 'filled' : '' }}">{{ commerce.note }}</td>
|
||||
<td class="{{ commerce.noteContent ? 'filled' : '' }}">{{ commerce.noteContent }}</td>
|
||||
<td class="{{ commerce.siret ? 'filled' : '' }}"> <a href="https://annuaire-entreprises.data.gouv.fr/etablissement/{{ commerce.siret }}" > {{ commerce.siret }}</a></td>
|
||||
<td>
|
||||
<a href="https://www.openstreetmap.org/{{ commerce.osmKind }}/{{ commerce.osmId }}" target="_blank">
|
||||
<a href="https://www.openstreetmap.org/{{ commerce.osmKind }}/{{ commerce.osmId }}" >
|
||||
<i class="bi bi-globe"></i>
|
||||
{{ commerce.osmId }}
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,15 @@
|
|||
<th>
|
||||
<i class="bi bi-geo-alt"></i>
|
||||
Adresse ({{ stats.getAvecAdresse() }} / {{ stats.places|length }})</th>
|
||||
|
||||
<th>
|
||||
<i class="bi bi-house-fill"></i>
|
||||
Rue
|
||||
</th>
|
||||
<th>
|
||||
<i class="bi bi-house-fill"></i>
|
||||
Numéro
|
||||
</th>
|
||||
<i class="bi bi-globe"></i>
|
||||
Site web ({{ stats.getAvecSite() }} / {{ stats.places|length }})</th>
|
||||
<th>
|
||||
|
|
@ -28,6 +36,10 @@
|
|||
<i class="bi bi-pencil-square"></i>
|
||||
Texte de la note</th>
|
||||
<th>
|
||||
<i class="bi bi-building"></i>
|
||||
Siret
|
||||
</th>
|
||||
<th>
|
||||
|
||||
Osm id</th>
|
||||
<th>
|
||||
|
|
|
|||
|
|
@ -2,20 +2,6 @@
|
|||
|
||||
{% block title %}{{ 'display.title'|trans }} {{ commerce_overpass.tags_converted.name }}{% endblock %}
|
||||
|
||||
{% block stylesheets %}
|
||||
{{ parent() }}
|
||||
<style>
|
||||
.hidden { display: none; }
|
||||
input[type="checkbox"] { width: 20px; height: 20px; }
|
||||
.is-invalid { border: 1px solid red; }
|
||||
.is-invalid #validation_messages { color: red; }
|
||||
img { max-width: 100%; max-height: 400px; }
|
||||
@media (max-width: 768px) {
|
||||
.form-label { margin-bottom: 0.5rem; }
|
||||
.mb-3 { margin-bottom: 1rem !important; }
|
||||
}
|
||||
</style>
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<div class="container edit-land mt-4">
|
||||
|
|
@ -39,18 +25,22 @@
|
|||
</div>
|
||||
|
||||
|
||||
{% if commerce_overpass.tags_converted.image is defined %}
|
||||
|
||||
<div id="images" class="d-none">
|
||||
<img class="img-fluid img-thumbnail mb-3" src="{{ commerce_overpass.tags_converted.image }}" />
|
||||
|
||||
|
||||
url d'image de la facade : {{ commerce_overpass.tags_converted.image }}
|
||||
{% if commerce_overpass.tags_converted.panoramax is defined or commerce_overpass.tags_converted.wikimedia_commons is defined %}
|
||||
<input type="text" class="form-control" name="commerce_tag_value__image" value="{{ commerce_overpass.tags_converted.image }}">
|
||||
url d'image sur Panoramax : {{ commerce_overpass.tags_converted.panoramax is defined ? commerce_overpass.tags_converted.panoramax : '' }}
|
||||
<input type="text" class="form-control" name="commerce_tag_value__panoramax" value="{{ commerce_overpass.tags_converted.panoramax is defined ? commerce_overpass.tags_converted.panoramax : '' }}">
|
||||
|
||||
wikimedia_commons:
|
||||
<input type="text" class="form-control" name="commerce_tag_value__wikimedia_commons" value="{{ commerce_overpass.tags_converted.wikimedia_commons is defined ? commerce_overpass.tags_converted.wikimedia_commons : '' }}">
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
|
||||
{% if commerce_overpass.tags_converted.amenity is defined and (commerce_overpass.tags_converted.amenity == 'restaurant' or commerce_overpass.tags_converted.amenity == 'bar' or commerce_overpass.tags_converted.amenity == 'cafe' or commerce_overpass.tags_converted.amenity == 'fast_food') %}
|
||||
{% include 'public/edit/restaurant.html.twig' %}
|
||||
|
|
@ -187,12 +177,6 @@
|
|||
{{ parent() }}
|
||||
<script src={{asset('js/mapbox/mapbox-gl.js')}}></script>
|
||||
<script>
|
||||
{# function openInJOSM(type, id) {
|
||||
const josmUrl = `http://localhost:8111/load_object?objects=${type}${id}`;
|
||||
window.open(josmUrl);
|
||||
} #}
|
||||
|
||||
|
||||
{% if commerce is not empty and mapbox_token is not empty and maptiler_token is not empty and commerce_overpass['@attributes'].lon is defined and commerce_overpass['@attributes'].lat is defined %}
|
||||
mapboxgl.accessToken = '{{ mapbox_token }}';
|
||||
map = new mapboxgl.Map({
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div class="col-2 col-md-3">
|
||||
<img src="https://i0.wp.com/askforangela.co.uk/wp-content/uploads/2022/10/Ask-for-Angela-primary.png?fit=300%2C300&ssl=1" class="img-fluid img-thumbnail mb-3" alt="Image du lieu">
|
||||
<p class="more-info">
|
||||
<a href="https://arretonslesviolences.gouv.fr/focus/plan-angela" target="_blank">{{ 'display.ask_angela_more_info'|trans }}</a>
|
||||
<a href="https://arretonslesviolences.gouv.fr/focus/plan-angela">{{ 'display.ask_angela_more_info'|trans }}</a>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
|
|
|
|||
|
|
@ -60,24 +60,24 @@
|
|||
{{'display.keys.takeaway'|trans}}</label>
|
||||
</h3>
|
||||
|
||||
<div class="p-4">
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="commerce_tag_value__takeaway" id="takeaway_yes" value="yes" {% if commerce.tags_converted.takeaway is defined and commerce.tags_converted.takeaway == 'yes' %}checked{% endif %}>
|
||||
<label class="form-check-label" for="takeaway_yes">Oui mais pas uniquement à emporter</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="commerce_tag_value__takeaway" id="takeaway_only" value="only" {% if commerce.tags_converted.takeaway is defined and commerce.tags_converted.takeaway == 'only' %}checked{% endif %}>
|
||||
<label class="form-check-label" for="takeaway_only">Uniquement à emporter</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="commerce_tag_value__takeaway" id="takeaway_no" value="no" {% if commerce.tags_converted.takeaway is defined and commerce.tags_converted.takeaway == 'no' %}checked{% endif %}>
|
||||
<label class="form-check-label" for="takeaway_no">Nous ne proposons pas d'emporter les plats</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="commerce_tag_value__takeaway" id="takeaway_unknown" value="" {% if commerce.tags_converted.takeaway is not defined or commerce.tags_converted.takeaway == '' %}checked{% endif %}>
|
||||
<label class="form-check-label" for="takeaway_unknown">Je ne sais pas</label>
|
||||
</div>
|
||||
|
||||
<div class="p-4">
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="commerce_tag_value__takeaway" id="takeaway_yes" value="yes" {% if commerce.tags_converted.takeaway is defined and commerce.tags_converted.takeaway == 'yes' %}checked{% endif %}>
|
||||
<label class="form-check-label" for="takeaway_yes">Oui mais pas uniquement à emporter</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="commerce_tag_value__takeaway" id="takeaway_only" value="only" {% if commerce.tags_converted.takeaway is defined and commerce.tags_converted.takeaway == 'only' %}checked{% endif %}>
|
||||
<label class="form-check-label" for="takeaway_only">Uniquement à emporter</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="commerce_tag_value__takeaway" id="takeaway_no" value="no" {% if commerce.tags_converted.takeaway is defined and commerce.tags_converted.takeaway == 'no' %}checked{% endif %}>
|
||||
<label class="form-check-label" for="takeaway_no">Nous ne proposons pas d'emporter les plats</label>
|
||||
</div>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="commerce_tag_value__takeaway" id="takeaway_unknown" value="" {% if commerce.tags_converted.takeaway is not defined or commerce.tags_converted.takeaway == '' %}checked{% endif %}>
|
||||
<label class="form-check-label" for="takeaway_unknown">Je ne sais pas</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
91
templates/public/edit/yenaunpeuplusjevouslemets.html.twig
Normal file
91
templates/public/edit/yenaunpeuplusjevouslemets.html.twig
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
<div id="ask_angela">
|
||||
<fieldset >
|
||||
<h2>Y'en a un peu plus je vous le mets?</h2>
|
||||
<div class="p-4">
|
||||
|
||||
<div class="row mb-3">
|
||||
<div class="col-12 col-md-3">
|
||||
nombres d'étages
|
||||
</div>
|
||||
<div class="col-12 col-md-9">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row mb-3">
|
||||
<div class="col-12 col-md-3">
|
||||
wifi public
|
||||
</div>
|
||||
<div class="col-12 col-md-9">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row mb-3">
|
||||
<div class="col-12 col-md-3">
|
||||
toilettes
|
||||
</div>
|
||||
<div class="col-12 col-md-9">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__toilet" value="{{ commerce.tags_converted['toilet'] is defined ? commerce.tags_converted['toilet'] : '' }}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-3">
|
||||
<div class="col-12 col-md-3">
|
||||
table à langer
|
||||
</div>
|
||||
<div class="col-12 col-md-9">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__langer" value="{{ commerce.tags_converted['langer'] is defined ? commerce.tags_converted['langer'] : '' }}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-3">
|
||||
<div class="col-12 col-md-3">
|
||||
moyens de paiement proposés
|
||||
</div>
|
||||
<div class="col-12 col-md-9">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-3">
|
||||
<div class="col-12 col-md-3">
|
||||
étoiles michelin
|
||||
</div>
|
||||
<div class="col-12 col-md-9">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-3">
|
||||
<div class="col-12 col-md-3">
|
||||
médias sociaux
|
||||
</div>
|
||||
<div class="col-12 col-md-9">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__contact:mastodon" value="{{ commerce.tags_converted['contact:mastodon'] is defined ? commerce.tags_converted['contact:mastodon'] : '' }}">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__contact:facebook" value="{{ commerce.tags_converted['contact:facebook'] is defined ? commerce.tags_converted['contact:facebook'] : '' }}">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__contact:instagram" value="{{ commerce.tags_converted['contact:instagram'] is defined ? commerce.tags_converted['contact:instagram'] : '' }}">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__contact:twitter" value="{{ commerce.tags_converted['contact:twitter'] is defined ? commerce.tags_converted['contact:twitter'] : '' }}">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__contact:youtube" value="{{ commerce.tags_converted['contact:youtube'] is defined ? commerce.tags_converted['contact:youtube'] : '' }}">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__contact:tiktok" value="{{ commerce.tags_converted['contact:tiktok'] is defined ? commerce.tags_converted['contact:tiktok'] : '' }}">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__contact:linkedin" value="{{ commerce.tags_converted['contact:linkedin'] is defined ? commerce.tags_converted['contact:linkedin'] : '' }}">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__contact:pinterest" value="{{ commerce.tags_converted['contact:pinterest'] is defined ? commerce.tags_converted['contact:pinterest'] : '' }}">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__contact:snapchat" value="{{ commerce.tags_converted['contact:snapchat'] is defined ? commerce.tags_converted['contact:snapchat'] : '' }}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row mb-3">
|
||||
<div class="col-12 col-md-3">
|
||||
téléphone
|
||||
</div>
|
||||
<div class="col-12 col-md-9">
|
||||
<input type="text" class="form-control" name="commerce_tag_value__contact:phone" value="{{ commerce.tags_converted['contact:phone'] is defined ? commerce.tags_converted['contact:phone'] : '' }}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-3">
|
||||
<div class="col-12 col-md-3">
|
||||
|
||||
</div>
|
||||
<div class="col-12 col-md-9">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
|
|
@ -26,9 +26,9 @@
|
|||
<span class="last-modification">{{ 'display.last_modification'|trans }}: {{ commerce['@attributes'].timestamp }}</span>,
|
||||
{{ 'display.days_ago'|trans({'%days%': date(commerce['@attributes'].timestamp).diff(date()).days}) }}
|
||||
{{ 'display.by'|trans }}
|
||||
<a href="https://www.openstreetmap.org/user/{{ commerce['@attributes'].user }}" target="_blank">{{ commerce['@attributes'].user }}</a>
|
||||
<a href="https://www.openstreetmap.org/user/{{ commerce['@attributes'].user }}" >{{ commerce['@attributes'].user }}</a>
|
||||
<div class="lien-OpenStreetMap">
|
||||
<a href="https://www.openstreetmap.org/node/{{ commerce['@attributes'].id }}" target="_blank">{{ 'display.view_on_osm'|trans }}</a>
|
||||
<a href="https://www.openstreetmap.org/node/{{ commerce['@attributes'].id }}" >{{ 'display.view_on_osm'|trans }}</a>
|
||||
</div>
|
||||
</span>
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<td>{{ place.modifiedDate | date('Y-m-d H:i:s') }}</td>
|
||||
<td>{{ place.zipCode }}</td>
|
||||
<td>
|
||||
<a href="https://www.openstreetmap.org/{{place.osmKind}}/{{ place.osmId }}" target="_blank"><i class="bi bi-globe"></i></a>
|
||||
<a href="https://www.openstreetmap.org/{{place.osmKind}}/{{ place.osmId }}" ><i class="bi bi-globe"></i></a>
|
||||
|
||||
{% if place.name %}
|
||||
<a href="{{ path('app_public_edit', {'zipcode': place.zipCode, 'name': place.name|url_encode, 'uuid': place.uuidForUrl}) }}"><i class="bi bi-pencil"></i></a>
|
||||
|
|
|
|||
|
|
@ -14,16 +14,38 @@
|
|||
<span class="badge bg-success p-4">{{status}}</span>
|
||||
|
||||
<p class="p-4 col-12 col-lg-8">
|
||||
Merci d'avoir contribué à l'amélioration de la base de données OSM, votre contribution sera visible sur de nombreux sites web.
|
||||
Merci d'avoir contribué à l'amélioration de la base de données OSM, votre contribution sera visible sur de nombreux sites web et dans la base adresse nationale des lieux et commerces.
|
||||
|
||||
<br>
|
||||
Modifer votre commerce?
|
||||
Réutilisez le lien secret que vous avez reçu par email.
|
||||
|
||||
Compléter les informations de votre commerce?
|
||||
Complétez les informations ici ou bien réutilisez plus tard le lien secret que vous avez reçu par email.
|
||||
<br>
|
||||
|
||||
Envie de contribuer ailleurs ?
|
||||
Créez votre propre compte OpenStreetMap sur <a href="https://osm.org" >osm.org</a>, et venez discuter avec les autres contributeurs sur le forum de la communauté OSM sur <a href="https://forum.openstreetmap.fr" target="_blank">forum.openstreetmap.fr</a>.
|
||||
Créez votre propre compte OpenStreetMap sur <a href="https://osm.org" >osm.org</a>, et venez discuter avec les autres contributeurs sur le forum de la communauté OSM sur <a href="https://forum.openstreetmap.fr" >forum.openstreetmap.fr</a>.
|
||||
|
||||
<hr>
|
||||
|
||||
<form action="{{ path('app_public_submit', {'osm_object_id': commerce_overpass['@attributes'].id, 'version': commerce_overpass['@attributes'].version, 'changesetID': commerce_overpass['@attributes'].changeset }) }}" method="post" class="needs-validation">
|
||||
<input type="hidden" name="osm_kind" value="{{ osm_kind }}">
|
||||
|
||||
|
||||
{% include 'public/edit/yenaunpeuplusjevouslemets.html.twig' %}
|
||||
{% include 'public/edit/social_media.html.twig' %}
|
||||
{% include 'public/edit/address.html.twig' %}
|
||||
{% include 'public/edit/clim.html.twig' %}
|
||||
{% include 'public/edit/ask_angela.html.twig' %}
|
||||
{% include 'public/edit/wheelchair.html.twig' %}
|
||||
|
||||
<div id="validation_messages" class="alert alert-danger d-none"></div>
|
||||
<div class="d-grid gap-2 d-md-flex justify-content-md-end mt-4">
|
||||
<button type="submit" class="btn btn-primary col-12 col-md-5">
|
||||
<i class="bi bi-send"></i>
|
||||
{{ 'display.submit'|trans }}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</p>
|
||||
{% else %}
|
||||
<span class="badge bg-danger p-4">{{status}}</span>
|
||||
|
|
@ -33,6 +55,12 @@
|
|||
</div>
|
||||
|
||||
{% endblock %}
|
||||
{% block javascripts %}
|
||||
{{ parent() }}
|
||||
|
||||
{% block javascripts %}
|
||||
{{ parent() }}
|
||||
<script>
|
||||
|
||||
check_validity();
|
||||
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue