Skip to content

Add plugin to use nominatim (#716) #723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+53 −67
Open

Add plugin to use nominatim (#716) #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions atlas/configuration/config.py.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@ MAP = {
'ENABLE_SLIDER': True
}

# Ajout du plugin permetant une recherche d'adresse sur les cartes de la page d'acceuil et territoire
SEARCH_NOMINATIM = True
# Paramètres de recherche du plugin
GEOCODING_QUERY_PARAMS = {
"countrycodes": "FR",
# Ouest, Nord, Est, Sud
"viewbox": "-2.025228103,47.567932519,-1.011314484,46.903000500",
"bounded": 1 # 1 pour chercher uniquement dans la viewbox définit au dessus
}

###########################
###########################
###### Liste Rouge #######
Expand Down
8 changes: 8 additions & 0 deletions atlas/configuration/config_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,14 @@ class Meta:
AFFICHAGE_RECHERCHE_AVANCEE = fields.Boolean(load_default=False)
AFFICHAGE_GRAPH_ALTITUDES = fields.Boolean(load_default=True)
AFFICHAGE_GRAPH_PHENOLOGIE = fields.Boolean(load_default=True)
SEARCH_NOMINATIM = fields.Boolean(load_default=False)
GEOCODING_QUERY_PARAMS = fields.Dict(
load_default={
"countrycodes": "FR",
"viewbox": "-180,90,180,-90",
"bounded": 1
}
)
TYPE_TERRITOIRE_SHEET = fields.List(fields.String(), load_default=["COM"])
AFFICHAGE_GRAPH_PHENOLOGIE = fields.Boolean(load_default=False)
ALTITUDE_RANGES = fields.List(
Expand Down
1 change: 1 addition & 0 deletions atlas/static/mapAreas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ var myGeoJson;

const id_area = areaInfos.areaID
displayObs(id_area)
addGeocoderPluggin()


// Display limit of the territory
Expand Down
2 changes: 2 additions & 0 deletions atlas/static/mapHome.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ $('#map').click(function(){
map.scrollWheelZoom.enable();
})

addGeocoderPluggin()

function displayObsTaxonMaille(cd_ref) {
$.ajax({
url:
Expand Down
87 changes: 20 additions & 67 deletions atlas/static/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions atlas/static/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"jspdf": "^3.0.3",
"jspdf-autotable": "^5.0.2",
"leaflet": "^1.9.4",
"leaflet-control-geocoder": "^3.3.1",
"leaflet.fullscreen": "^4.0.0",
"leaflet.markercluster": "^1.5.3",
"leaflet.snogylop": "^0.4.0",
Expand Down
6 changes: 6 additions & 0 deletions atlas/templates/areaSheet/_main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
<link rel="stylesheet" href="{{ url_for('static', filename='node_modules/leaflet.markercluster/dist/MarkerCluster.css') }}"/>
<link rel="stylesheet" href="{{ url_for('static', filename='node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css') }}"/>
<link rel="stylesheet" href="{{ url_for('static', filename='css/areaSheet.css') }}" />

{% if configuration.SEARCH_NOMINATIM %}
<link rel="stylesheet" href="{{ url_for('static', filename='node_modules/leaflet-control-geocoder/dist/Control.Geocoder.css') }}" />
<script src="{{ url_for('static', filename='node_modules/leaflet-control-geocoder/dist/Control.Geocoder.js') }}"></script>
{% endif %}

{% endblock %}

{% block additionalFooterAssets %}
Expand Down
4 changes: 4 additions & 0 deletions atlas/templates/home/_main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
observations_mailles = {{observations_mailles|tojson}},
url_limit_territory = "{{url_for('static', filename='custom/territoire.json') }}";
</script>
{% if configuration.SEARCH_NOMINATIM %}
<link rel="stylesheet" href="{{ url_for('static', filename='node_modules/leaflet-control-geocoder/dist/Control.Geocoder.css') }}" />
<script src="{{ url_for('static', filename='node_modules/leaflet-control-geocoder/dist/Control.Geocoder.js') }}"></script>
{% endif %}
{% endblock %}

{% block additionalFooterAssets %}
Expand Down
1 change: 1 addition & 0 deletions docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ CHANGELOG
- Le statut d'espèce protégée n'est plus calculé à partir d'un attribut TaxHub mais à partir de la BDC statuts #135
- Déplacement des fichiers de personnalisation ``sample`` dans le dossier ``static/sample/``. Le dossier ``static/custom/`` est à utiliser pour surcoucher les fichiers de ``static/sample/``.
- Ajout d'un gestionnaire de couches cartographiques supplémentaires (WMS et geojson) dans le paramètre ``COUCHES_SIG`` (#572 @juggler31)
- Ajout d'un plugin permetant une recheche d'adresse sur les cartes de la page d'acceuil et territoire (#716 @juggler31)

A VERIFIER :

Expand Down
Loading