zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update cartodb v3 asset

Browse Source
pull/13450/head
Ivan Malagon 7 years ago
parent 6ccaaeba6d
commit b598414b31
2 changed files with 149 additions and 96 deletions
Show Stats Download Patch File Download Diff File

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "cartodb-ui",
"version": "4.11.22-1",
"version": "4.11.22-2",
"description": "CARTO UI frontend",
"repository": {
"type": "git",

237
vendor/assets/javascripts/cartodb.uncompressed.js vendored
Unescape View File

@ -1,6 +1,6 @@
// cartodb.js version: 3.15.12
// cartodb.js version: 3.15.13
// uncompressed version: cartodb.uncompressed.js
// sha: fd59cdbd94906f554d820cef55009ec795aaf5f0
// sha: 8d3010fdc8fdfe6e4248343baebb152079a43fef
(function() {
var define; // Undefine define (require.js), see https://github.com/CartoDB/cartodb.js/issues/543
var root = this;
@ -25659,7 +25659,7 @@ if (typeof window !== 'undefined') {
var cdb = root.cdb = {};
cdb.VERSION = "3.15.12";
cdb.VERSION = "3.15.13";
cdb.DEBUG = false;
cdb.CARTOCSS_VERSIONS = {
@ -26856,90 +26856,90 @@ cdb.geo.geocoder.YAHOO = {
app_id: "nLQPTdTV34FB9L3yK2dCXydWXRv3ZKzyu_BdCSrmCBAM1HgGErsCyCbBbVP2Yg--"
},
geocode: function(address, callback) {
geocode: function (address, callback) {
address = address.toLowerCase()
.replace(/é/g,'e')
.replace(/á/g,'a')
.replace(/í/g,'i')
.replace(/ó/g,'o')
.replace(/ú/g,'u')
.replace(/ /g,'+');
.replace(/é/g, 'e')
.replace(/á/g, 'a')
.replace(/í/g, 'i')
.replace(/ó/g, 'o')
.replace(/ú/g, 'u')
.replace(/ /g, '+');
var protocol = '';
if(location.protocol.indexOf('http') === -1) {
protocol = 'http:';
}
var protocol = '';
if (location.protocol.indexOf('http') === -1) {
protocol = 'http:';
}
$.getJSON(protocol + '//query.yahooapis.com/v1/public/yql?q='+encodeURIComponent('SELECT * FROM json WHERE url="http://where.yahooapis.com/geocode?q=' + address + '&appid=' + this.keys.app_id + '&flags=JX"') + '&format=json&callback=?', function(data) {
$.getJSON(protocol + '//query.yahooapis.com/v1/public/yql?q=' + encodeURIComponent('SELECT * FROM json WHERE url="http://where.yahooapis.com/geocode?q=' + address + '&appid=' + this.keys.app_id + '&flags=JX"') + '&format=json&callback=?', function (data) {
var coordinates = [];
if (data && data.query && data.query.results && data.query.results.json && data.query.results.json.ResultSet && data.query.results.json.ResultSet.Found != "0") {
var coordinates = [];
if (data && data.query && data.query.results && data.query.results.json && data.query.results.json.ResultSet && data.query.results.json.ResultSet.Found != "0") {
// Could be an array or an object |arg!
var res;
// Could be an array or an object |arg!
var res;
if (_.isArray(data.query.results.json.ResultSet.Results)) {
res = data.query.results.json.ResultSet.Results;
} else {
res = [data.query.results.json.ResultSet.Results];
}
if (_.isArray(data.query.results.json.ResultSet.Results)) {
res = data.query.results.json.ResultSet.Results;
} else {
res = [data.query.results.json.ResultSet.Results];
}
for(var i in res) {
var r = res[i],
for (var i in res) {
var r = res[i],
position;
position = {
lat: r.latitude,
lon: r.longitude
};
if (r.boundingbox) {
position.boundingbox = r.boundingbox;
}
position = {
lat: r.latitude,
lon: r.longitude
};
coordinates.push(position);
if (r.boundingbox) {
position.boundingbox = r.boundingbox;
}
coordinates.push(position);
}
}
callback(coordinates);
});
callback(coordinates);
});
}
};
cdb.geo.geocoder.MAPZEN = {
keys:{
app_id: "mapzen-YfBeDWS"
keys: {
app_id: "mapzen-YfBeDWS"
},
geocode: function(address, callback){
geocode: function (address, callback) {
address = address.toLowerCase()
.replace(/é/g,'e')
.replace(/á/g,'a')
.replace(/í/g,'i')
.replace(/ó/g,'o')
.replace(/ú/g,'u');
.replace(/é/g, 'e')
.replace(/á/g, 'a')
.replace(/í/g, 'i')
.replace(/ó/g, 'o')
.replace(/ú/g, 'u');
var protocol = '';
if(location.protocol.indexOf('http') === -1) {
if (location.protocol.indexOf('http') === -1) {
protocol = 'http:';
}
$.getJSON(protocol + '//search.mapzen.com/v1/search?text=' + encodeURIComponent(address) + '&api_key=' + this.keys.app_id, function(data) {
$.getJSON(protocol + '//search.mapzen.com/v1/search?text=' + encodeURIComponent(address) + '&api_key=' + this.keys.app_id, function (data) {
var coordinates = [];
if (data && data.features && data.features.length > 0) {
var res = data.features;
for (var i in res){
for (var i in res) {
var r = res[i],
position;
position;
position = {
lat: r.geometry.coordinates[1],
lon: r.geometry.coordinates[0]
};
if(r.properties.layer){
if (r.properties.layer) {
position.type = r.properties.layer;
}
if(r.properties.label){
if (r.properties.label) {
position.title = r.properties.label;
}
@ -26957,65 +26957,118 @@ cdb.geo.geocoder.MAPZEN = {
cdb.geo.geocoder.NOKIA = {
keys: {
app_id: "KuYppsdXZznpffJsKT24",
app_id: "KuYppsdXZznpffJsKT24",
app_code: "A7tBPacePg9Mj_zghvKt9Q"
},
geocode: function(address, callback) {
geocode: function (address, callback) {
address = address.toLowerCase()
.replace(/é/g,'e')
.replace(/á/g,'a')
.replace(/í/g,'i')
.replace(/ó/g,'o')
.replace(/ú/g,'u');
.replace(/é/g, 'e')
.replace(/á/g, 'a')
.replace(/í/g, 'i')
.replace(/ó/g, 'o')
.replace(/ú/g, 'u');
var protocol = '';
if(location.protocol.indexOf('http') === -1) {
protocol = 'http:';
}
var protocol = '';
if (location.protocol.indexOf('http') === -1) {
protocol = 'http:';
}
$.getJSON(protocol + '//places.nlp.nokia.com/places/v1/discover/search/?q=' + encodeURIComponent(address) + '&app_id=' + this.keys.app_id + '&app_code=' + this.keys.app_code + '&Accept-Language=en-US&at=0,0&callback=?', function(data) {
$.getJSON(protocol + '//places.nlp.nokia.com/places/v1/discover/search/?q=' + encodeURIComponent(address) + '&app_id=' + this.keys.app_id + '&app_code=' + this.keys.app_code + '&Accept-Language=en-US&at=0,0&callback=?', function (data) {
var coordinates = [];
if (data && data.results && data.results.items && data.results.items.length > 0) {
var coordinates = [];
if (data && data.results && data.results.items && data.results.items.length > 0) {
var res = data.results.items;
var res = data.results.items;
for(var i in res) {
var r = res[i],
for (var i in res) {
var r = res[i],
position;
position = {
lat: r.position[0],
lon: r.position[1]
};
position = {
lat: r.position[0],
lon: r.position[1]
};
if (r.bbox) {
position.boundingbox = {
north: r.bbox[3],
south: r.bbox[1],
east: r.bbox[2],
west: r.bbox[0]
};
}
if (r.category) {
position.type = r.category.id;
}
if (r.title) {
position.title = r.title;
}
coordinates.push(position);
if (r.bbox) {
position.boundingbox = {
north: r.bbox[3],
south: r.bbox[1],
east: r.bbox[2],
west: r.bbox[0]
};
}
if (r.category) {
position.type = r.category.id;
}
if (r.title) {
position.title = r.title;
}
coordinates.push(position);
}
}
if (callback) {
callback.call(this, coordinates);
}
});
if (callback) {
callback.call(this, coordinates);
}
});
}
};
cdb.geo.geocoder.MAPBOX = {
keys: {
access_token: 'pk.eyJ1IjoiY2FydG8tdGVhbSIsImEiOiJjamNseTl3ZzQwZnFkMndudnIydnJoMXZxIn0.HycQBkaaV7ZwLkHm5hEmfg',
},
TYPES : {
country: 'country',
region: 'region',
postcode: 'postal-area',
district: 'localadmin',
place: 'venue',
locality: 'locality',
neighborhood: 'neighbourhood',
address: 'address',
poi: 'venue',
'poi.landmark': 'venue'
},
geocode: function (address, callback) {
address = address.toLowerCase()
.replace(/é/g, 'e')
.replace(/á/g, 'a')
.replace(/í/g, 'i')
.replace(/ó/g, 'o')
.replace(/ú/g, 'u');
var protocol = '';
if (location.protocol.indexOf('http') === -1) {
protocol = 'http:';
}
$.getJSON(protocol + '//api.mapbox.com/geocoding/v5/mapbox.places/' + encodeURIComponent(address) + '.json?access_token=' + this.keys.access_token, function (response) {
callback(this._formatResponse(response));
}.bind(this));
},
// Transform a raw response into a array with the cartodb format
_formatResponse: function (rawResponse) {
if (!rawResponse.features.length) {
return [];
}
return [
{
lat: rawResponse.features[0].center[1],
lon: rawResponse.features[0].center[0],
type: this.TYPES[rawResponse.features[0].type] || 'default',
title: rawResponse.features[0].text,
}
];
}
};
/**
* basic geometries, all of them based on geojson
*/
@ -31113,7 +31166,7 @@ cdb.geo.ui.Search = cdb.core.View.extend({
this._showLoader();
// Remove previous pin
this._destroySearchPin();
cdb.geo.geocoder.MAPZEN.geocode(address, function(places) {
cdb.geo.geocoder.MAPBOX.geocode(address, function(places) {
self._onResult(places);
// Hide loader
self._hideLoader();

Write Preview
Loading…
Cancel
Save