compute stats for completion by zone, have base tags, split categories

This commit is contained in:
Tykayn 2025-05-26 23:51:46 +02:00 committed by tykayn
parent f15fec6d18
commit f69b7824af
16 changed files with 1257 additions and 118 deletions

View file

@ -11,15 +11,37 @@
<div class="example-wrapper">
<h1>Labourage fait sur la zone "{{ zone }}" ✅</h1>
<p>
lieux trouvés en plus: {{ results|length }}
</p>
{# {{ dump(results) }} #}
{% for commerce in results %}
<p>
{{ commerce.name }}
</p>
<pre>
{{ dump(commerce) }}
</pre>
<hr>
<p>
commerces existants disposant d'un moyen de contact mail: {{ commerces|length }}
</p>
{# {{ dump(commerces[0]) }} #}
<ul>
{% for commerce in commerces %}
<li>
{% if commerce.name is not null %}
{{ commerce.name }},
{% else %}
un lieu sans nom
{% endif %}
{# {{ commerce.note }},
{{ commerce.has_address }},
{{ commerce.has_website }},
{{ commerce.has_wheelchair }},
{{ commerce.has_note }} #}
<a href="https://www.openstreetmap.org/{{ commerce.getOsmKind() }}/{{ commerce.getOsmId() }}" target="_blank">voir sur osm</a>
</li>
{% endfor %}
</ul>
</div>
{% endblock %}

View file

@ -0,0 +1,192 @@
{% extends 'base.html.twig' %}
{% block title %}{{ 'display.stats'|trans }}{% endblock %}
{% block body %}
<div class="container">
<div class="card mt-4 p-4">
<h1 class="card-title">{{ 'display.stats'|trans }}</h1>
<p>
{{ stats.zone }}
</p>
<p>
{# {{ dump(stats) }} #}
</p>
{{ stats.getCompletionPercent() }} % complété sur les critères donnés.
<br>
{{ stats.getPlacesCount() }} commerces dans la zone.
<br>
{{ stats.getAvecHoraires() }} commerces avec horaires.
<br>
{{ stats.getAvecAdresse() }} commerces avec adresse.
<br>
{{ stats.getAvecSite() }} commerces avec site web renseigné.
<br>
{{ stats.getAvecAccessibilite() }} commerces avec accessibilité renseignée.
<br>
{{ stats.getAvecNote() }} commerces avec note renseignée.
<br>
</div>
<div class="card mt-4">
<h1 class="card-title">Tableau des commerces</h1>
<table class="table table-bordered">
<thead>
<tr>
<th>Nom ({{ stats.getPlacesCount() }})</th>
<th>Adresse ({{ stats.getAvecAdresse() }} / {{ stats.getPlacesCount() }})</th>
<th>Site web ({{ stats.getAvecSite() }} / {{ stats.getPlacesCount() }})</th>
<th>Accessibilité ({{ stats.getAvecAccessibilite() }} / {{ stats.getPlacesCount() }})</th>
<th>Note ({{ stats.getAvecNote() }} / {{ stats.getPlacesCount() }})</th>
</tr>
</thead>
<tbody>
{% for commerce in stats.places %}
<tr>
<td style="background-color: {{ commerce.hasAddress() ? 'yellowgreen' : 'transparent' }};">{{ commerce.name }}</td>
<td style="background-color: {{ commerce.hasAddress() ? 'yellowgreen' : 'transparent' }};">{{ commerce.address }}</td>
<td style="background-color: {{ commerce.hasWebsite() ? 'yellowgreen' : 'transparent' }};">{{ commerce.website }}</td>
<td style="background-color: {{ commerce.hasWheelchair() ? 'yellowgreen' : 'transparent' }};">{{ commerce.wheelchair }}</td>
<td style="background-color: {{ commerce.hasNote() ? 'yellowgreen' : 'transparent' }};">{{ commerce.note }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
<style>
/* Styles spécifiques pour la page stats */
.stats-container {
display: flex;
flex-direction: column;
gap: 1rem;
}
.stat-item {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0.5rem;
background-color: var(--light-gray);
border-radius: 4px;
}
.stat-label {
font-weight: 500;
color: var(--primary-color);
}
.stat-value {
font-size: 1.25rem;
font-weight: bold;
color: var(--secondary-color);
}
.modifications-list {
display: flex;
flex-direction: column;
gap: 0.75rem;
}
.modification-item {
padding: 0.75rem;
background-color: var(--light-gray);
border-radius: 4px;
}
.modification-header {
margin-bottom: 0.25rem;
}
.modification-date {
font-size: 0.875rem;
color: var(--text-color);
opacity: 0.8;
}
.modification-details {
display: flex;
justify-content: space-between;
align-items: center;
}
.modification-type {
font-weight: 500;
color: var(--primary-color);
}
.shop-types-list {
display: flex;
flex-direction: column;
gap: 0.5rem;
}
.shop-type-item {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0.5rem;
background-color: var(--light-gray);
border-radius: 4px;
}
.shop-type-name {
font-weight: 500;
}
.shop-type-count {
background-color: var(--secondary-color);
color: white;
padding: 0.25rem 0.5rem;
border-radius: 12px;
font-size: 0.875rem;
}
.places-table-container {
overflow-x: auto;
}
.places-table {
width: 100%;
border-collapse: collapse;
margin-top: 1rem;
}
.places-table th,
.places-table td {
padding: 0.75rem;
text-align: left;
border-bottom: 1px solid var(--border-color);
}
.places-table th {
background-color: var(--light-gray);
font-weight: 500;
color: var(--primary-color);
}
.places-table tr:hover {
background-color: var(--light-gray);
}
.btn-sm {
padding: 0.25rem 0.75rem;
font-size: 0.875rem;
}
@media (max-width: 768px) {
.grid-3 {
grid-template-columns: 1fr;
}
.places-table {
font-size: 0.875rem;
}
.btn-sm {
padding: 0.25rem 0.5rem;
}
}
</style>
{% endblock %}

View file

@ -10,6 +10,7 @@
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
{# Run `composer require symfony/webpack-encore-bundle` to start using Symfony UX #}
{% block stylesheets %}
{{ encore_entry_link_tags('app') }}
{% endblock %}
@ -17,6 +18,7 @@
<body>
<header class="main-header">
<div class="container">
<div class="row">
<div class="col-12">
<a href="{{ path('app_public_index') }}">
@ -24,6 +26,38 @@
</a>
</div>
</div>
{% for label, messages in app.flashes %}
{% for message in messages %}
<div class="alert alert-{{ label }} alert-dismissible fade show" role="alert">
{{ message }}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
{% endfor %}
{% endfor %}
<div class="row">
<div class="col-12">
<nav class="navbar navbar-expand-lg navbar-light bg-light mb-4 rounded shadow-sm">
<div class="container-fluid">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link active" href="{{ path('app_public_index') }}">{{ 'display.home'|trans }}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ path('app_public_dashboard') }}">{{ 'display.stats'|trans }}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="https://openstreetmap.fr/contact/">{{ 'display.contact_humans'|trans }}</a>
</li>
</ul>
</div>
</div>
</nav>
</div>
</div>
</div>
</header>
<div class="body-landing">
@ -34,7 +68,9 @@
<div class="row">
<div class="col-12">
<p>OpenStreetMap Mon Commerce</p>
<p>Licence AGPLv3+, fait par CipherBliss, membre de la fédération des professionels d'OpenStreetMap, Sources des données : <a href="https://www.openstreetmap.org/">OpenStreetMap</a>.
<p>Licence AGPLv3+,
fait par Tykayn de
<a href="https://www.cipherbliss.com">CipherBliss EI</a>, membre de la fédération des professionels d'OpenStreetMap, Sources des données : <a href="https://www.openstreetmap.org/">OpenStreetMap</a>.
<br> <a href="https://www.openstreetmap.org/copyright">OpenStreetMap France</a></p>
</div>
</div>

View file

@ -18,30 +18,7 @@
{% block body %}
<div class="container mt-4">
<div class="row">
<div class="col-12">
<nav class="navbar navbar-expand-lg navbar-light bg-light mb-4 rounded shadow-sm">
<div class="container-fluid">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link active" href="{{ path('app_public_index') }}">{{ 'display.home'|trans }}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ path('app_public_dashboard') }}">{{ 'display.stats'|trans }}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="https://openstreetmap.fr/contact/">{{ 'display.contact_humans'|trans }}</a>
</li>
</ul>
</div>
</div>
</nav>
</div>
</div>
<div class="row">
<div class="col-12">
@ -50,22 +27,18 @@
<h1 class="card-title mb-4">{{ 'display.welcome'|trans }}</h1>
<div id="map" style="height: 400px; width: 100%;" class="rounded"></div>
{% if commerce is not empty %}
<div class="row mb-4">
<div class="col-12">
</div>
</div>
{% if commerce_overpass is not empty %}
<form action="{{ path('app_public_submit', {'osm_object_id': commerce['@attributes'].id, 'version': commerce['@attributes'].version, 'changesetID': commerce['@attributes'].changeset }) }}" method="post" class="needs-validation">
<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 }}">
<div class="mb-3">
<label for="commerce_id" class="form-label">{{ 'display.modify_commerce'|trans }}:
<strong>
{% if commerce.tags_converted.name is defined %}
{{ commerce.tags_converted.name }}
{% elseif commerce['@attributes'].name is defined %}
{{ commerce['@attributes'].name }}
{% if commerce_overpass.tags_converted.name is defined %}
{{ commerce_overpass.tags_converted.name }}
{% elseif commerce_overpass['@attributes'].name is defined %}
{{ commerce_overpass['@attributes'].name }}
{% else %}
{{ 'display.unknown'|trans }}
{% endif %}
@ -98,7 +71,7 @@
{# cas d'une mairie
#}
{% if commerce.tags_converted.amenity is defined %}
{# {% if commerce.tags_converted.amenity is defined %}
{% if commerce.tags_converted.amenity == 'townhall' %}
{% include 'public/edit/townhall.html.twig' %}
{% endif %}
@ -106,16 +79,16 @@
{% if commerce.tags_converted.amenity == 'restaurant' %}
{% include 'public/edit/restaurant.html.twig' %}
{% endif %}
{% endif %}
{% endif %} #}
</div>
</div>
{% include 'public/edit/ask_angela.html.twig' %}
{% include 'public/edit/wheelchair.html.twig' %}
{% include 'public/edit/opening_hours.html.twig' %}
{% include 'public/edit/address.html.twig' %}
{% include 'public/edit/tags.html.twig' %}
{# {# {% include 'public/edit/wheelchair.html.twig' %} #}
{# {% include 'public/edit/opening_hours.html.twig' %}
{% include 'public/edit/address.html.twig' %} #} #}
{% include 'public/edit/tags.html.twig' %}
<button type="submit" class="btn btn-primary">{{ 'display.submit'|trans }}</button>
</form>
@ -124,15 +97,15 @@
</div>
</div>
<span class="p-3">
<span class="last-modification">{{ 'display.last_modification'|trans }}: {{ commerce['@attributes'].timestamp }}</span>,
{{ 'display.days_ago'|trans({'%days%': date(commerce['@attributes'].timestamp).diff(date()).days}) }}
<span class="last-modification">{{ 'display.last_modification'|trans }}: {{ commerce_overpass['@attributes'].timestamp }}</span>,
{{ 'display.days_ago'|trans({'%days%': date(commerce_overpass['@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_overpass['@attributes'].user }}" target="_blank">{{ commerce_overpass['@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_overpass['@attributes'].id }}" target="_blank">{{ 'display.view_on_osm'|trans }}</a>
</div>
{{ dump(commerce) }}
{{ dump(commerce_overpass) }}
</span>
<div class="disclaimer p-3">
@ -162,25 +135,31 @@
{% block javascripts %}
{{ parent() }}
<script src='https://api.mapbox.com/mapbox-gl-js/v2.15.0/mapbox-gl.js'></script>
{# <script>
<script>
{% if commerce is not empty and mapbox_token is not empty and maptiler_token is not empty %}
mapboxgl.accessToken = '{{ mapbox_token }}';
map = new mapboxgl.Map({
container: 'map',
style: 'https://api.maptiler.com/maps/basic-v2/style.json?key={{ maptiler_token }}',
center: [{{ commerce['@attributes'].lon }}, {{ commerce['@attributes'].lat }}],
center: [
{# {{ commerce_overpass['@attributes'].lon }}, #}
{# {{ commerce_overpass['@attributes'].lat }} #}
],
zoom: 14
});
// Ajout du marqueur
new mapboxgl.Marker()
.setLngLat([{{ commerce.lon }}, {{ commerce.lat }}])
.setLngLat([
{# {{ commerce.lon }}, #}
{# {{ commerce.lat }} #}
])
.setPopup(new mapboxgl.Popup({
offset: 25
}).setHTML('<h1>{{ commerce.tags_converted.name }}</h1>'))
}).setHTML('<h1>{{ commerce_overpass.tags_converted.name }}</h1>'))
.addTo(map);
{% endif %}
</script> #}
</script>
{% endblock %}
{% endblock %}

View file

@ -2,7 +2,16 @@
<h2>{{ 'display.opening_hours'|trans }}</h2>
<p class="description">{{ 'display.opening_hours_description'|trans }}</p>
<input type="checkbox" name="commerce_tag_value__opening_hours_1" value="yes">
{% if commerce_overpass.tags_converted.opening_hours is defined %}
{{ dump(commerce_overpass.tags_converted.opening_hours) }}
{% else %}
<input type="text" name="commerce_tag_value__opening_hours" value="">
<br> ajoutez les horaires au format OSM
{% endif %}
{# <input type="checkbox" name="commerce_tag_value__opening_hours_1" value="yes">
Lundi de
<input type="number" name="commerce_tag_value__opening_hours_1_midday_hour" value="">
@ -16,7 +25,8 @@
à
<input type="number" name="commerce_tag_value__opening_hours_1_midday_minute" value="">.
<input type="checkbox" name="commerce_tag_value__opening_hours_1_evening" value="yes">
<input type="checkbox" name="commerce_tag_value__opening_hours_1_evening" value="yes"> #}
<hr>
<script src="https://cdn.jsdelivr.net/npm/yohours@0.0.14/src/index.min.js"></script>
</script>
</div>

View file

@ -1,21 +1,16 @@
{% block tags %}<fieldset>
<div id="tags">
{% for attributes in commerce.tag %}
{% for kv in attributes %}
{# {% if kv.k == 'opening_hours' %}
{{ 'display.keys.opening_hours'|trans }}
{% else %} #}
{% for k, v in commerce_overpass.tags_converted %}
<div class="row mb-3">
<div class="col-md-5">
<input type="text" class="form-control hidden" name="commerce_tag_key__{{ kv.k }}" value="{{ kv.k }}" readonly>
<span class="label-translated">{{ ('display.keys.' ~ kv.k)|trans }}</span>
<input type="text" class="form-control hidden" name="commerce_tag_key__{{ k }}" value="{{ k }}" readonly>
<span class="label-translated">{{ ('display.keys.' ~ k)|trans }}</span>
</div>
<div class="col-md-5">
<input type="text" class="form-control" name="commerce_tag_value__{{ kv.k }}" value="{{ kv.v }}">
<input type="text" class="form-control" name="commerce_tag_value__{{ k }}" value="{{ v }}">
</div>
</div>
{# {% endif %} #}
{% endfor %}
{% endfor %}
</div></fieldset>

View file

@ -14,40 +14,12 @@
{% block body %}
<div class="container mt-4">
<div class="row">
<div class="col-12">
<nav class="navbar navbar-expand-lg navbar-light bg-light mb-4 rounded shadow-sm">
<div class="container-fluid">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link active" href="{{ path('app_public_index') }}">{{ 'display.home'|trans }}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ path('app_public_dashboard') }}">{{ 'display.stats'|trans }}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="https://openstreetmap.fr/contact/">{{ 'display.contact_humans'|trans }}</a>
</li>
</ul>
</div>
</div>
</nav>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="card shadow-sm">
<div class="card-body">
<h1 class="card-title mb-4">{{ 'display.welcome'|trans }}</h1>
<div id="map" style="height: 400px; width: 100%;" class="rounded"></div>
</div>
<div class="card shadow-sm p-4">
Ce site permet aux commerçants et aux lieux référencés sur OpenStreetMap de modifier leurs informations facilement pour gagner en visibilité sur des milliers de sites web à la fois.
</div>
</div>
<span class="p-3">