Skip to content
This repository has been archived by the owner on Nov 29, 2023. It is now read-only.

feature: use v2 enketo geocoder api #770

Closed
wants to merge 1 commit into from
Closed

feature: use v2 enketo geocoder api #770

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
30 changes: 15 additions & 15 deletions src/widget/geo/geopicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ const maps = ( config && config.maps && config.maps.length > 0 ) ? config.maps :
'tiles': [ 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png' ],
'attribution': '© <a href="http://openstreetmap.org">OpenStreetMap</a> | <a href="www.openstreetmap.org/copyright">Terms</a>'
} ];
let searchSource = 'https://maps.googleapis.com/maps/api/geocode/json?address={address}&sensor=true&key={api_key}';
const googleApiKey = config.googleApiKey || config.google_api_key;
let searchSource = config.geocoderUrl || '/api/v2/geocoder';
const iconSingle = L.divIcon( {
iconSize: 24,
className: 'enketo-geopoint-marker'
Expand Down Expand Up @@ -562,12 +561,6 @@ class Geopicker extends Widget {
_enableSearch() {
const that = this;

if ( googleApiKey ) {
searchSource = searchSource.replace( '{api_key}', googleApiKey );
} else {
searchSource = searchSource.replace( '&key={api_key}', '' );
}

this.$search
.prop( 'disabled', false )
.on( 'change', function( event ) {
Expand All @@ -576,12 +569,22 @@ class Geopicker extends Widget {

if ( address ) {
address = address.split( /\s+/ ).join( '+' );
let center, bbox;
if( that._dynamicMapAvailable() ){
bbox = that.map.getBounds();
center = bbox.getCenter();
}
$
.get( searchSource.replace( '{address}', address ), response => {
.get( searchSource + '?' + $.param( {
address: address,
$center: center ? [ center.lng, center.lat ].join( ',' ) : undefined,
// $bbox: bbox.toBBoxString(),
$limit: 1,
} ), response => {
let latLng;
if ( response.results && response.results.length > 0 && response.results[ 0 ].geometry && response.results[ 0 ].geometry.location ) {
latLng = response.results[ 0 ].geometry.location;
that._updateMap( [ latLng.lat, latLng.lng ], defaultZoom );
if ( response && response.length > 0 && response[ 0 ].geometry ) {
latLng = response[ 0 ].geometry.coordinates;
that._updateMap( [ latLng[1], latLng[0] ], defaultZoom );
that.$search.closest( '.input-group' ).removeClass( 'has-error' );
} else {
//TODO: add error message
Expand Down Expand Up @@ -760,9 +763,6 @@ class Geopicker extends Widget {
const tasks = [];

maps.forEach( ( map, index ) => {
if ( typeof map.tiles === 'string' && /^GOOGLE_(SATELLITE|ROADMAP|HYBRID|TERRAIN)/.test( map.tiles ) ) {
tasks.push( that._getGoogleTileLayer( map, index ) );
} else
if ( map.tiles ) {
tasks.push( that._getLeafletTileLayer( map, index ) );
} else {
Expand Down