Geospatial Addons for OpenERP

Merge lp:~geospatial-addons-core-editors/geospatial-addons/6.1-fix-mapbox into lp:~geospatial-addons-core-editors/geospatial-addons/6.1

  1. 6.1-fix-mapbox
  2. Merge into 6.1
Proposed by Nicolas Bessi - Camptocamp
Status: Merged
Merged at revision: 89
Proposed branch: lp:~geospatial-addons-core-editors/geospatial-addons/6.1-fix-mapbox
Merge into: lp:~geospatial-addons-core-editors/geospatial-addons/6.1
Diff against target: 110 lines (+27/-11)
6 files modified
base_geoengine/__openerp__.py (+1/-1)
base_geoengine/geo_view/geo_raster_layer.py (+1/-3)
base_geoengine/geo_view/geo_raster_layer_view.xml (+1/-1)
base_geoengine/static/src/js/geoengine_view.js (+22/-4)
base_geoengine_demo/retail_machine_view.xml (+1/-1)
base_geoengine_demo/zip_view.xml (+1/-1)
To merge this branch: bzr merge lp:~geospatial-addons-core-editors/geospatial-addons/6.1-fix-mapbox
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp code review, no test Approve
Review via email: mp+146146@code.launchpad.net

Description of the change

FIX to support new MapBox API and add a better default style.

Courtesy of F. Junod

To post a comment you must log in.
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

How are the existing data migrated from the mapbox_type column to the mapbox_id column?

review: Needs Fixing
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote :

Hello,

You can't do it automatically, before mapbox was in beta and open. Now you need to create a mapbox account create a map and then you obtain your mapbox id. There is no API to register from outside services.

Maybe we should add some comment view or __openerp__.py

Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

Ok then.

LGTM

review: Approve (code review, no test)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'base_geoengine/__openerp__.py'
2--- base_geoengine/__openerp__.py 2012-12-04 10:37:30 +0000
3+++ base_geoengine/__openerp__.py 2013-02-01 15:15:29 +0000
4@@ -19,7 +19,7 @@
5 #
6 ##############################################################################
7 {'name': 'Geospatial support for OpenERP',
8- 'version': '0.1',
9+ 'version': '0.2.0',
10 'category': 'GeoBI',
11 'description': """
12 Geospatial support based on PostGIS
13
14=== modified file 'base_geoengine/geo_view/geo_raster_layer.py'
15--- base_geoengine/geo_view/geo_raster_layer.py 2012-12-05 08:32:38 +0000
16+++ base_geoengine/geo_view/geo_raster_layer.py 2013-02-01 15:15:29 +0000
17@@ -41,9 +41,7 @@
18 ('G_HYBRID_MAP', 'Google Hybrid map'),
19 ('G_PHYSICAL_MAP', 'Google Physical map')],
20 string="Google raster layer type"),
21- 'mapbox_type': fields.selection([('mapbox.mapbox-streets', 'Streets'),
22- ('mapbox.mapbox-light', 'Light')],
23- string="Mapbox raster layer type"),
24+ 'mapbox_id': fields.char("Mapbox ID", size=256),
25 'swisstopo_type': fields.selection([('ch.swisstopo.pixelkarte-farbe', 'Color map'),
26 ('ch.swisstopo.swissimage', 'Aerial imagery')],
27 string="Swisstopo raster layer type"),
28
29=== modified file 'base_geoengine/geo_view/geo_raster_layer_view.xml'
30--- base_geoengine/geo_view/geo_raster_layer_view.xml 2012-12-05 08:32:38 +0000
31+++ base_geoengine/geo_view/geo_raster_layer_view.xml 2013-02-01 15:15:29 +0000
32@@ -25,7 +25,7 @@
33 <group string="MapBox layer data"
34 attrs="{'invisible': [('raster_type', '!=', 'mapbox')]}"
35 colspan="4">
36- <field name="mapbox_type" attrs="{'required': [('raster_type', '=', 'mapbox')]}"/>
37+ <field name="mapbox_id" attrs="{'required': [('raster_type', '=', 'mapbox')]}"/>
38 </group>
39 <group string="swisstopo layer data"
40 attrs="{'invisible': [('raster_type', '!=', 'swisstopo')]}"
41
42=== modified file 'base_geoengine/static/src/js/geoengine_view.js'
43--- base_geoengine/static/src/js/geoengine_view.js 2013-01-11 18:03:03 +0000
44+++ base_geoengine/static/src/js/geoengine_view.js 2013-02-01 15:15:29 +0000
45@@ -88,10 +88,10 @@
46 case "mapbox":
47 out.push(
48 new OpenLayers.Layer.XYZ(l.name, [
49- "http://a.tiles.mapbox.com/v3/" + l.mapbox_type + "/${z}/${x}/${y}.png",
50- "http://b.tiles.mapbox.com/v3/" + l.mapbox_type + "/${z}/${x}/${y}.png",
51- "http://c.tiles.mapbox.com/v3/" + l.mapbox_type + "/${z}/${x}/${y}.png",
52- "http://d.tiles.mapbox.com/v3/" + l.mapbox_type + "/${z}/${x}/${y}.png"
53+ "http://a.tiles.mapbox.com/v3/" + l.mapbox_id + "/${z}/${x}/${y}.png",
54+ "http://b.tiles.mapbox.com/v3/" + l.mapbox_id + "/${z}/${x}/${y}.png",
55+ "http://c.tiles.mapbox.com/v3/" + l.mapbox_id + "/${z}/${x}/${y}.png",
56+ "http://d.tiles.mapbox.com/v3/" + l.mapbox_id + "/${z}/${x}/${y}.png"
57 ], {
58 sphericalMercator: true,
59 wrapDateLine: true,
60@@ -576,6 +576,24 @@
61
62 create_edit_layers: function(self, field_infos) {
63 var vl = new OpenLayers.Layer.Vector(self.name, {
64+ styleMap: new OpenLayers.StyleMap({
65+ 'default': new OpenLayers.Style({
66+ fillColor: '#ee9900',
67+ fillOpacity: 0.7,
68+ strokeColor: '#ee9900',
69+ strokeOpacity: 1,
70+ strokeWidth: 3,
71+ pointRadius: 6
72+ }),
73+ 'select': new OpenLayers.Style({
74+ fillColor: 'red',
75+ strokeColor: 'red'
76+ }),
77+ 'temporary': new OpenLayers.Style({
78+ fillColor: 'blue',
79+ strokeColor: 'blue'
80+ })
81+ }),
82 eventListeners : {
83 featuremodified: function(event) {
84 this._geometry = event.feature.geometry;
85
86=== modified file 'base_geoengine_demo/retail_machine_view.xml'
87--- base_geoengine_demo/retail_machine_view.xml 2012-12-05 08:33:10 +0000
88+++ base_geoengine_demo/retail_machine_view.xml 2013-02-01 15:15:29 +0000
89@@ -167,7 +167,7 @@
90 </record>
91 <record id="geoengine_raster_layer_retailmachinemapbox" model="geoengine.raster.layer">
92 <field name="raster_type">mapbox</field>
93- <field name="mapbox_type">mapbox.mapbox-streets</field>
94+ <field name="mapbox_id">camptocamp.map-ok288g0c</field>
95 <field name="name">Retail Machine Mapbox</field>
96 <field name="view_id" ref="ir_ui_view_retailmachineview0"/>
97 <field eval="0" name="overlay"/>
98
99=== modified file 'base_geoengine_demo/zip_view.xml'
100--- base_geoengine_demo/zip_view.xml 2012-12-05 08:33:10 +0000
101+++ base_geoengine_demo/zip_view.xml 2013-02-01 15:15:29 +0000
102@@ -92,7 +92,7 @@
103 </record>
104 <record id="geoengine_raster_layer_mapbox0" model="geoengine.raster.layer">
105 <field name="raster_type">mapbox</field>
106- <field name="mapbox_type">mapbox.mapbox-light</field>
107+ <field name="mapbox_id">camptocamp.map-qrf4x</field>
108 <field name="name">ZIP Mapbox Light</field>
109 <field name="view_id" ref="ir_ui_view_resbetterzipgeoview0"/>
110 <field eval="1" name="overlay"/>

Subscribers

People subscribed via source and target branches