Skip to content
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

Add tomtom geocoder (v3) #2216

Merged
merged 12 commits into from
Jan 9, 2019
Merged

Add tomtom geocoder (v3) #2216

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
95d0302
Add TOMTOM geocoder service
elenatorro Jan 3, 2019
1496a56
Use default keys if there is no config
elenatorro Jan 3, 2019
614daab
Remove npm log
elenatorro Jan 3, 2019
7bfc78f
Release version and update NEWS.md
elenatorro Jan 3, 2019
18bc9c2
Add missing files
elenatorro Jan 3, 2019
6527c04
Use v3 instead of develop
elenatorro Jan 3, 2019
fb89064
Revert ES6 usage
elenatorro Jan 3, 2019
f1dc7d9
Revert ES6 usage
elenatorro Jan 3, 2019
9523880
Merge latest changes
elenatorro Jan 3, 2019
163d95d
Fix merge issue
elenatorro Jan 3, 2019
16bfd3d
Upgrade version
elenatorro Jan 3, 2019
7ddec0d
Update version
elenatorro Jan 9, 2019
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
6 changes: 5 additions & 1 deletion NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
3.15.19 (02/01/2019)
------
* Use TomTom as default geocoder.

3.15.12 (12/06/2017)
-------
* New Mapzen API key.
Expand Down Expand Up @@ -104,7 +108,7 @@
* Fixed enabling or disabling the torque loop property not working from cartodb.js
* Allows to specify a step when generating a static map of a Torque layer
* Deprecation warning:
- tiler_host, tiler_prototol, tiler_port, sql_api_domain, sql_api_protocol are deprecated, use sql_api_template and maps_api_template instead. https://github.com/CartoDB/cartodb.js/blob/develop/doc/API.md#how-to-set-a-different-host-than-cartodbcom
- tiler_host, tiler_prototol, tiler_port, sql_api_domain, sql_api_protocol are deprecated, use sql_api_template and maps_api_template instead. https://github.com/CartoDB/cartodb.js/blob/v3/doc/API.md#how-to-set-a-different-host-than-cartodbcom

3.13.3 (09/04/2015)
------
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ bower install cartodb.js

## Documentation

You can find the documentation online [here](http://docs.cartodb.com/cartodb-platform/cartodb-js.html) and the [source](https://github.com/CartoDB/cartodb.js/blob/develop/doc/API.md) inside this repository.
You can find the documentation online [here](http://docs.cartodb.com/cartodb-platform/cartodb-js.html) and the [source](https://github.com/CartoDB/cartodb.js/blob/v3/doc/API.md) inside this repository.

## Examples

Expand Down
12 changes: 6 additions & 6 deletions doc/api_methods.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,16 +141,16 @@ layerSource | contains information about the layer. It can be specified in multi
options |
--- | ---
|_ https | loads the layer as HTTPS. True forces the layer to load. See [HTTPS support](https://carto.com/docs/carto-engine/carto-js/getting-started/#https-support) for example code.
&#124;_ refreshTime | if set, the layer is auto refreshed in milliseconds. See a refreshTime code [example](https://github.com/CartoDB/cartodb.js/blob/develop/examples/createLayer_refresh_time.html).<br/><br/>**Tip:** To refresh and display the latest data in seconds, include the seconds after the defined milliseconds in the code (i.e., `refreshTime: 2000 // 2 seconds`).
&#124;_ refreshTime | if set, the layer is auto refreshed in milliseconds. See a refreshTime code [example](https://github.com/CartoDB/cartodb.js/blob/v3/examples/createLayer_refresh_time.html).<br/><br/>**Tip:** To refresh and display the latest data in seconds, include the seconds after the defined milliseconds in the code (i.e., `refreshTime: 2000 // 2 seconds`).
&#124;_ infowindow | set to false if you want to disable the infowindow (enabled by default). For details, see [Creating an infowindow with the `createLayer()` function](http://docs.carto.com/faqs/infowindows/#creating-an-infowindow-with-the-createlayer-function).
&#124;_ tooltip | set to false if you want to disable the tooltip (enabled by default). This option is specific for when you create a map using the CARTO Editor, and have enabled the tooltip [(infowindow hover)](http://docs.carto.com/carto-editor/maps/#infowindows) option. This option disables the tooltip in createLayer.<br/><br/>See a tooltip code [example](https://github.com/CartoDB/cartodb.js/blob/develop/examples/createLayer_custom_tooltip.html).
&#124;_ legends | set to true to show legends in the map. For an example, see this [CARTO.js example with legends disabled](https://github.com/CartoDB/cartodb.js/blob/develop/examples/createLayer_noLegend.html).
&#124;_ time_slider | show an animated time slider with Torque layers. This option is enabled by default, as shown with `time_slider: true` value. To disable the time slider, use `time_slider: false`. See a Torque Time Slider code [example](https://github.com/CartoDB/cartodb.js/blob/develop/examples/torque_time_slider.html).<br/><br/> For details about customizing the time slider, see the [Torque.js](http://docs.carto.com/carto-engine/torque/torque-time-slider/) documentation.
&#124;_ tooltip | set to false if you want to disable the tooltip (enabled by default). This option is specific for when you create a map using the CARTO Editor, and have enabled the tooltip [(infowindow hover)](http://docs.carto.com/carto-editor/maps/#infowindows) option. This option disables the tooltip in createLayer.<br/><br/>See a tooltip code [example](https://github.com/CartoDB/cartodb.js/blob/v3/examples/createLayer_custom_tooltip.html).
&#124;_ legends | set to true to show legends in the map. For an example, see this [CARTO.js example with legends disabled](https://github.com/CartoDB/cartodb.js/blob/v3/examples/createLayer_noLegend.html).
&#124;_ time_slider | show an animated time slider with Torque layers. This option is enabled by default, as shown with `time_slider: true` value. To disable the time slider, use `time_slider: false`. See a Torque Time Slider code [example](https://github.com/CartoDB/cartodb.js/blob/v3/examples/torque_time_slider.html).<br/><br/> For details about customizing the time slider, see the [Torque.js](http://docs.carto.com/carto-engine/torque/torque-time-slider/) documentation.
&#124;_ loop | a boolean object that defines the animation loop with Torque layers. Default value is `true`. If `false`, the animation is paused when it reaches the last frame. For details about Torque, see the [Torque.js](http://docs.carto.com/carto-engine/torque-js/) documentation.
&#124;_ layerIndex | when the visualization contains more than one layer this index allows you to select what layer is created. Take into account that `layerIndex == 0` is the base layer and that all the tiled layers (non animated ones) are merged into a single one. The default value for this option is 1 (usually tiled layers).<br/><br/>See [`layer.featureOver(_event, latlng, pos, data, layerIndex_`)](http://docs.carto.com/carto-engine/carto-js/events/#layerfeatureoverevent-latlng-pos-data-layerindex) for details about binding functions to layer events.
&#124;_ filter | A string, or array of values, that specifies the type(s) of sublayers to be rendered if you are using multiple types of layer source objects (eg: `['http', 'mapnik')](http://docs.carto.com/carto-engine/maps-api/mapconfig/#layergroup-configurations). All non-torque layers (http and mapnik) will be rendered if this option is not present.<br/><br/>See a createLayer filter [example](http://docs.carto.com/carto-engine/carto-js/layer-source-object/#multiple-types-of-layers-source-object).
&#124;_ no_cdn | set to true to disable CDN when fetching tiles. For a complete example of this code, see ["odyssey_test.html"](https://github.com/CartoDB/cartodb.js/blob/2983b2fdcef914afdb1f4fdae173471143930452/examples/odyssey_test.html).
callback(_layer_) | if a function is specified, it will be invoked after the layer has been created. The layer will be passed as an argument.<br/><br/> See the [example of loading multiple layers from CARTO in a Leaflet Map](https://github.com/CartoDB/cartodb.js/blob/develop/examples/callback_layer.html).
callback(_layer_) | if a function is specified, it will be invoked after the layer has been created. The layer will be passed as an argument.<br/><br/> See the [example of loading multiple layers from CARTO in a Leaflet Map](https://github.com/CartoDB/cartodb.js/blob/v3/examples/callback_layer.html).

### Passing the url where the layer data is located
```javascript
Expand Down Expand Up @@ -506,7 +506,7 @@ maxHeight | Max height of the scrolled content (value must be a number).
</script>
```

[Here is the complete example source code](https://github.com/CartoDB/cartodb.js/blob/develop/examples/custom_infowindow.html)
[Here is the complete example source code](https://github.com/CartoDB/cartodb.js/blob/v3/examples/custom_infowindow.html)

---

Expand Down
2 changes: 1 addition & 1 deletion doc/core_api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ If you want to use this functionality, you only need to load cartodb.core.js fro
<script src="http://libs.cartocdn.com/cartodb.js/v3/3.15/cartodb.core.js"></script>
```

An example using this functionality can be found in a ModestMaps example: [view live](http://cartodb.github.com/cartodb.js/examples/modestmaps.html) / [source code](https://github.com/CartoDB/cartodb.js/blob/develop/examples/modestmaps.html).
An example using this functionality can be found in a ModestMaps example: [view live](http://cartodb.github.com/cartodb.js/examples/modestmaps.html) / [source code](https://github.com/CartoDB/cartodb.js/blob/v3/examples/modestmaps.html).

Notice that `cartodb.SQL` is also included in that JavaScript file

Expand Down
12 changes: 6 additions & 6 deletions doc/getting_started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ window.onload = function() {
</script>
```

[Here is the complete example source code](https://github.com/CartoDB/cartodb.js/blob/develop/examples/easy.html)
[Here is the complete example source code](https://github.com/CartoDB/cartodb.js/blob/v3/examples/easy.html)

## Using the CARTO.js Library

Expand Down Expand Up @@ -108,7 +108,7 @@ Below, you have an example using a previously instantiated Leaflet map.
</script>
```

[Here is the complete example source code](https://github.com/CartoDB/cartodb.js/blob/develop/examples/leaflet.html)
[Here is the complete example source code](https://github.com/CartoDB/cartodb.js/blob/v3/examples/leaflet.html)

## Creating Visualizations at Runtime

Expand Down Expand Up @@ -219,7 +219,7 @@ cartodb.createLayer(map, 'http://examples.carto.com/api/v1/viz/0001/viz.json')

The best way to start learning about the library is by taking a look at some of the examples below:

+ An easy example using the library - ([view live](http://cartodb.github.com/cartodb.js/examples/easy.html) / [source code](https://github.com/CartoDB/cartodb.js/blob/develop/examples/easy.html)).
+ Leaflet integration - ([view live](http://cartodb.github.com/cartodb.js/examples/leaflet.html) / [source code](https://github.com/CartoDB/cartodb.js/blob/develop/examples/leaflet.html)).
+ Customizing infowindow data - ([view live](http://cartodb.github.com/cartodb.js/examples/custom_infowindow.html) / [source code](https://github.com/CartoDB/cartodb.js/blob/develop/examples/custom_infowindow.html)).
+ An example using a layer selector - ([view live](http://cartodb.github.com/cartodb.js/examples/layer_selector.html) / [source code](https://github.com/CartoDB/cartodb.js/blob/develop/examples/layer_selector.html)).
+ An easy example using the library - ([view live](http://cartodb.github.com/cartodb.js/examples/easy.html) / [source code](https://github.com/CartoDB/cartodb.js/blob/v3/examples/easy.html)).
+ Leaflet integration - ([view live](http://cartodb.github.com/cartodb.js/examples/leaflet.html) / [source code](https://github.com/CartoDB/cartodb.js/blob/v3/examples/leaflet.html)).
+ Customizing infowindow data - ([view live](http://cartodb.github.com/cartodb.js/examples/custom_infowindow.html) / [source code](https://github.com/CartoDB/cartodb.js/blob/v3/examples/custom_infowindow.html)).
+ An example using a layer selector - ([view live](http://cartodb.github.com/cartodb.js/examples/layer_selector.html) / [source code](https://github.com/CartoDB/cartodb.js/blob/v3/examples/layer_selector.html)).
154 changes: 79 additions & 75 deletions grunt/tasks/jasmine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,88 +9,92 @@ module.exports = {
return {
dist: {
src: [
"vendor/jquery.min.js",
"vendor/underscore-min.js",
"vendor/backbone.js",
"vendor/leaflet.js",
"vendor/wax.cartodb.js",
"vendor/mustache.js",
"vendor/GeoJSON.js",
"vendor/jscrollpane.js",
"vendor/spin.js",
"vendor/lzma.js",
"vendor/mod/carto.js",
"vendor/mod/torque.uncompressed.js",
"vendor/mod/jquery-ui/jquery.ui.core.js",
"vendor/mod/jquery-ui/jquery.ui.widget.js",
"vendor/mod/jquery-ui/jquery.ui.mouse.js",
"vendor/mod/jquery-ui/jquery.ui.slider.js",
"vendor/html-css-sanitizer-bundle.js",
"test/lib/sinon-1.3.4.js",
"test/lib/sinon-ie.js",
"src/cartodb.js",
"src/core/**/*.js",
"src/geo/geometry.js",
"src/geo/map.js",
"src/geo/ui/header.js",
"src/geo/ui/legend.js",
"src/geo/ui/infobox.js",
"src/geo/ui/infowindow.js",
"src/geo/ui/search.js",
"src/geo/ui/mobile.js",
"src/geo/ui/annotation.js",
"src/geo/ui/layer_selector.js",
'vendor/jquery.min.js',
'vendor/underscore-min.js',
'vendor/backbone.js',
'vendor/leaflet.js',
'vendor/wax.cartodb.js',
'vendor/mustache.js',
'vendor/GeoJSON.js',
'vendor/jscrollpane.js',
'vendor/spin.js',
'vendor/lzma.js',
'vendor/mod/carto.js',
'vendor/mod/torque.uncompressed.js',
'vendor/mod/jquery-ui/jquery.ui.core.js',
'vendor/mod/jquery-ui/jquery.ui.widget.js',
'vendor/mod/jquery-ui/jquery.ui.mouse.js',
'vendor/mod/jquery-ui/jquery.ui.slider.js',
'vendor/html-css-sanitizer-bundle.js',
'test/lib/sinon-1.3.4.js',
'test/lib/sinon-ie.js',
'src/cartodb.js',
'src/core/**/*.js',
'src/geo/geometry.js',
'src/geo/map.js',
'src/geo/ui/header.js',
'src/geo/ui/legend.js',
'src/geo/ui/infobox.js',
'src/geo/ui/infowindow.js',
'src/geo/ui/search.js',
'src/geo/ui/mobile.js',
'src/geo/ui/annotation.js',
'src/geo/ui/layer_selector.js',
'src/geo/ui/slides_controller.js',
"src/geo/ui/share.js",
"src/geo/ui/zoom_info.js",
"src/geo/ui/tiles_loader.js",
"src/geo/ui/zoom.js",
"src/geo/ui/tooltip.js",
"src/geo/ui/time_slider.js",
"src/geo/ui/fullscreen.js",
"src/geo/sublayer.js",
"src/geo/layer_definition.js",
"src/geo/common.js",
"src/geo/leaflet/leaflet.geometry.js",
"src/geo/leaflet/leaflet_base.js",
"src/geo/leaflet/leaflet_plainlayer.js",
"src/geo/leaflet/leaflet_tiledlayer.js",
"src/geo/leaflet/leaflet_gmaps_tiledlayer.js",
"src/geo/leaflet/leaflet_wmslayer.js",
"src/geo/leaflet/leaflet_cartodb_layergroup.js",
"src/geo/leaflet/leaflet_cartodb_layer.js",
"src/geo/leaflet/torque.js",
"src/geo/leaflet/leaflet.js",
"src/geo/gmaps/gmaps.geometry.js",
"src/geo/gmaps/gmaps_base.js",
"src/geo/gmaps/gmaps_baselayer.js",
"src/geo/gmaps/gmaps_plainlayer.js",
"src/geo/gmaps/gmaps_tiledlayer.js",
"src/geo/gmaps/gmaps_cartodb_layergroup.js",
"src/geo/gmaps/gmaps_cartodb_layer.js",
"src/geo/gmaps/torque.js",
"src/geo/gmaps/gmaps.js",
"src/geo/geocoder.js",
"src/ui/common/dialog.js",
"src/ui/common/share.js",
"src/ui/common/notification.js",
"src/ui/common/table.js",
"src/ui/common/tabpane.js",
"src/ui/common/dropdown.js",
"src/vis/vis.js",
"src/vis/image.js",
"src/vis/layers.js",
"src/vis/overlays.js",
"src/api/layers.js",
"src/api/sql.js",
"src/api/vis.js"
'src/geo/ui/share.js',
'src/geo/ui/zoom_info.js',
'src/geo/ui/tiles_loader.js',
'src/geo/ui/zoom.js',
'src/geo/ui/tooltip.js',
'src/geo/ui/time_slider.js',
'src/geo/ui/fullscreen.js',
'src/geo/sublayer.js',
'src/geo/layer_definition.js',
'src/geo/common.js',
'src/geo/leaflet/leaflet.geometry.js',
'src/geo/leaflet/leaflet_base.js',
'src/geo/leaflet/leaflet_plainlayer.js',
'src/geo/leaflet/leaflet_tiledlayer.js',
'src/geo/leaflet/leaflet_gmaps_tiledlayer.js',
'src/geo/leaflet/leaflet_wmslayer.js',
'src/geo/leaflet/leaflet_cartodb_layergroup.js',
'src/geo/leaflet/leaflet_cartodb_layer.js',
'src/geo/leaflet/torque.js',
'src/geo/leaflet/leaflet.js',
'src/geo/gmaps/gmaps.geometry.js',
'src/geo/gmaps/gmaps_base.js',
'src/geo/gmaps/gmaps_baselayer.js',
'src/geo/gmaps/gmaps_plainlayer.js',
'src/geo/gmaps/gmaps_tiledlayer.js',
'src/geo/gmaps/gmaps_cartodb_layergroup.js',
'src/geo/gmaps/gmaps_cartodb_layer.js',
'src/geo/gmaps/torque.js',
'src/geo/gmaps/gmaps.js',
'src/geo/geocoders/mapbox_geocoder.js',
'src/geo/geocoders/mapzen_geocoder.js',
'src/geo/geocoders/nokia_geocoder.js',
'src/geo/geocoders/tomtom_geocoder.js',
'src/geo/geocoders/yahoo_geocoder.js',
'src/ui/common/dialog.js',
'src/ui/common/share.js',
'src/ui/common/notification.js',
'src/ui/common/table.js',
'src/ui/common/tabpane.js',
'src/ui/common/dropdown.js',
'src/vis/vis.js',
'src/vis/image.js',
'src/vis/layers.js',
'src/vis/overlays.js',
'src/api/layers.js',
'src/api/sql.js',
'src/api/vis.js'
],
options: {
keepRunner: true,
outfile: 'test/SpecRunner.html',
specs: 'test/spec/**/*.js',
helpers: 'test/spec/SpecHelper.js',
vendor: [ "http://maps.googleapis.com/maps/api/js?sensor=false&v=3.12" ],
vendor: [ 'http://maps.googleapis.com/maps/api/js?sensor=false&v=3.12' ],
summary: true,
display: 'short'
}
Expand Down
7 changes: 6 additions & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@
//= require cdb/vendor/mod/jquery-ui/jquery.ui.mouse
//= require cdb/vendor/mod/jquery-ui/jquery.ui.slider
//
//= require cdb/src/geo/geocoder
//= require cdb/src/geo/geocoders/mapbox_geocoder
//= require cdb/src/geo/geocoders/mapzen_geocoder
//= require cdb/src/geo/geocoders/nokia_geocoder
//= require cdb/src/geo/geocoders/tomtom_geocoder
//= require cdb/src/geo/geocoders/yahoo_geocoder

//= require cdb/src/geo/geometry
//= require cdb/src/geo/map
//
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cartodb.js",
"version": "3.15.13",
"version": "3.15.19",
"description": "CartoDB javascript library",
"repository": {
"type": "git",
Expand Down
16 changes: 11 additions & 5 deletions secrets.example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
{
"S3_KEY": "",
"S3_SECRET": "",
"S3_BUCKET": "",
"AWS_ACCESS_KEY": "",
"AWS_SECRET_KEY": "",
"AWS_DISTRIBUTION": "",
"AWS_SECRET_KEY": "",
"FASTLY_API_KEY": "",
"FASTLY_CARTODB_SERVICE": ""
"FASTLY_CARTODB_SERVICE": "",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really nice @elenatorro
Hopefully we'll have really geocoder smoooooth changes in the future 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm still testing this, this is just too complicated for something that should be more simple, let's see if we can fix it :)

"GEOCODER_KEY_MAPBOX": "",
"GEOCODER_ID_MAPZEN": "",
"GEOCODER_ID_NOKIA": "",
"GEOCODER_CODE_NOKIA": "",
"GEOCODER_KEY_TOMTOM": "",
"GEOCODER_ID_YAHOO": "",
"S3_BUCKET": "",
"S3_KEY": "",
"S3_SECRET": ""
}
7 changes: 6 additions & 1 deletion src/cartodb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,12 @@
'core/loader.js',
'core/util.js',

'geo/geocoder.js',
'geo/geocoders/mapbox_geocoder.js',
'geo/geocoders/mapzen_geocoder.js',
'geo/geocoders/nokia_geocoder.js',
'geo/geocoders/tomtom_geocoder.js',
'geo/geocoders/yahoo_geocoder.js',

'geo/geometry.js',
'geo/map.js',
'geo/ui/text.js',
Expand Down
Loading