| 120,8 → 120,9 |
|---|
| // Pays est pour le moment sur un varchar(2) dans la base |
| // alors qu'il est envoyé complet par le script WidgetSaisie |
| $obsAAjouter['osm_country'] = (isset($obs['pays'])) ? $obs['pays'] : null; |
| $obsAAjouter['locality'] = $obs['commune_nom']; |
| $obsAAjouter['locality_insee_code'] = isset($obs['commune_code_insee']) ? $obs['commune_code_insee'] : ''; |
| $obsAAjouter['osm_postcode'] = (isset($obs['code_postal'])) ? $obs['code_postal'] : null; |
| $obsAAjouter['locality'] = isset($obs['commune_nom']) && trim($obs['commune_nom']) !== "" ? $obs['commune_nom'] : null; |
| $obsAAjouter['locality_insee_code'] = isset($obs['commune_code_insee']) && trim($obs['commune_code_insee']) !== "" ? $obs['commune_code_insee'] : null; |
| $obsAAjouter['sublocality'] = isset($obs['lieudit']) && trim($obs['lieudit']) !== "" ? $obs['lieudit'] : null; |
| $obsAAjouter['station'] = isset($obs['station']) && trim($obs['station']) !== "" ? $obs['station'] : null; |
| $obsAAjouter['environment'] = isset($obs['milieu']) && trim($obs['milieu']) !== "" ? $obs['milieu'] : null; |
| 128,7 → 129,10 |
|---|
| $obsAAjouter['elevation'] = (! empty($obs['altitude'])) ? $obs['altitude'] : null; |
| $obsAAjouter['geometry'] = $obs['geometry'] ?? json_encode([ |
| 'type' => 'Point', |
| 'coordinates' => [ (float)str_replace(',', '.', $obs['longitude']),(float)str_replace(',', '.', $obs['latitude']) ] |
| 'coordinates' => [ |
| round((float)str_replace(',', '.', $obs['longitude']), 6), |
| round((float)str_replace(',', '.', $obs['latitude']), 6) |
| ] |
| ]); // CONCAT('{\"type\":\"Point\",\"coordinates\":[', longitude, ',', latitude,']}'), |
| $obsAAjouter['geodatum'] = 'WGS84'; |
| $obsAAjouter['published_location'] = ($this->tagsObs != null && in_array('sensible', $this->tagsObs) == true) ? |
| Property changes: |
|---|
| Modified: svn:mergeinfo |
|---|
| Merged /trunk/jrest/services/CelWidgetSaisie.php:r3757-3762 |
|---|