savoirfairelinux-openerp team mailing list archive
-
savoirfairelinux-openerp team
-
Mailing list archive
-
Message #00356
[Merge] lp:~savoirfairelinux-openerp/geospatial-addons/7.0 into lp:geospatial-addons
Sandy Carter (http://www.savoirfairelinux.com) has proposed merging lp:~savoirfairelinux-openerp/geospatial-addons/7.0 into lp:geospatial-addons.
Requested reviews:
Geospatial Addons Core Editors (geospatial-addons-core-editors)
For more details, see:
https://code.launchpad.net/~savoirfairelinux-openerp/geospatial-addons/7.0/+merge/186840
Adapted addon to be installable in OpenERP 7.0
Set most of the addons to installable, and fixed some XML differences in the views.
Fixed some JS errors, mainly setting openerp.web.form.Field -> openerp.web.form.AbstractField and openerp.web.page.readonly -> openerp.web.form.widget.
Minor widget modifications. Changed map and map-hover icon to openerp 7.0 style font characters from Entypo.
Currently has js errors on update_dom and won't display contents of map.
--
https://code.launchpad.net/~savoirfairelinux-openerp/geospatial-addons/7.0/+merge/186840
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/geospatial-addons/7.0.
=== modified file 'base_geoengine/__init__.py'
--- base_geoengine/__init__.py 2012-10-01 10:21:33 +0000
+++ base_geoengine/__init__.py 2013-09-20 16:37:54 +0000
@@ -21,7 +21,7 @@
"""The GeoEngine module"""
from __future__ import absolute_import
from . import geo_model
-import wizard
+from . import wizard
from . import geo_operators
from . import geo_view
from . import geo_helper
=== modified file 'base_geoengine/geo_ir/ir_model_view.xml'
--- base_geoengine/geo_ir/ir_model_view.xml 2011-09-08 12:32:55 +0000
+++ base_geoengine/geo_ir/ir_model_view.xml 2013-09-20 16:37:54 +0000
@@ -8,21 +8,22 @@
<!--parent python entity -->
<field name="inherit_id" ref="base.view_model_fields_form"/>
<!-- modulename.view -->
- <field name="type">form</field>
<field name="arch" type="xml">
- <notebook position="inside">
- <page string="GeoEngine attributes">
- <!-- nasty attrs but ilike operator does not work as expected -->
- <field name="srid"
- attrs="{'readonly': [('ttype', 'not in', ['geo_polygon', 'geo_multi_polygon', 'geo_point', 'geo_multi_point', 'geo_line', 'geo_multi_line'])]}"/>
- <field name="geo_type"
- attrs="{'readonly': [('ttype', 'not in', ['geo_polygon', 'geo_multi_polygon', 'geo_point', 'geo_multi_point', 'geo_line', 'geo_multi_line'])]}"/>
- <field name="dim"
- attrs="{'readonly': [('ttype', 'not in', ['geo_polygon', 'geo_multi_polygon', 'geo_point', 'geo_multi_point', 'geo_line', 'geo_multi_line'])]}"/>
- <field name="gist_index"
- attrs="{'readonly': [('ttype', 'not in', ['geo_polygon', 'geo_multi_polygon', 'geo_point', 'geo_multi_point', 'geo_line', 'geo_multi_line'])]}"/>
- </page>
- </notebook>
+ <form string="Fields" version="7.0">
+ <sheet>
+ <group>
+ <!-- nasty attrs but ilike operator does not work as expected -->
+ <field name="srid"
+ attrs="{'readonly': [('ttype', 'not in', ['geo_polygon', 'geo_multi_polygon', 'geo_point', 'geo_multi_point', 'geo_line', 'geo_multi_line'])]}"/>
+ <field name="geo_type"
+ attrs="{'readonly': [('ttype', 'not in', ['geo_polygon', 'geo_multi_polygon', 'geo_point', 'geo_multi_point', 'geo_line', 'geo_multi_line'])]}"/>
+ <field name="dim"
+ attrs="{'readonly': [('ttype', 'not in', ['geo_polygon', 'geo_multi_polygon', 'geo_point', 'geo_multi_point', 'geo_line', 'geo_multi_line'])]}"/>
+ <field name="gist_index"
+ attrs="{'readonly': [('ttype', 'not in', ['geo_polygon', 'geo_multi_polygon', 'geo_point', 'geo_multi_point', 'geo_line', 'geo_multi_line'])]}"/>
+ </group>
+ </sheet>
+ </form>
</field>
</record>
</data>
=== modified file 'base_geoengine/geo_view/geo_raster_layer_view.xml'
--- base_geoengine/geo_view/geo_raster_layer_view.xml 2013-02-01 15:03:10 +0000
+++ base_geoengine/geo_view/geo_raster_layer_view.xml 2013-09-20 16:37:54 +0000
@@ -4,9 +4,8 @@
<record model="ir.ui.view" id="geo_raster_view_form">
<field name="name">geoengine.raster.layer.form</field>
<field name="model">geoengine.raster.layer</field>
- <field name="type">form</field>
<field name="arch" type="xml">
- <form>
+ <form string="Raster Layer View">
<group string="General">
<field name="name" colspan="4"/>
<field name="view_id"/>
@@ -45,9 +44,8 @@
<record model="ir.ui.view" id="geo_raster_view_tree">
<field name="name">geoengine.raster.layer.tree</field>
<field name="model">geoengine.raster.layer</field>
- <field name="type">tree</field>
<field name="arch" type="xml">
- <tree>
+ <tree string="Raster">
<field name="name" select="1"/>
<field name="raster_type" select="1"/>
<field name="sequence"/>
=== modified file 'base_geoengine/geo_view/geo_vector_layer_view.xml'
--- base_geoengine/geo_view/geo_vector_layer_view.xml 2012-02-16 13:14:44 +0000
+++ base_geoengine/geo_view/geo_vector_layer_view.xml 2013-09-20 16:37:54 +0000
@@ -4,9 +4,8 @@
<record model="ir.ui.view" id="geo_vector_view_form">
<field name="name">geoengine.vector.layer.form</field>
<field name="model">geoengine.vector.layer</field>
- <field name="type">form</field>
<field name="arch" type="xml">
- <form>
+ <form string="Vector">
<group string="General">
<field name="name" colspan="4"/>
<field name="view_id"/>
@@ -45,9 +44,8 @@
<record model="ir.ui.view" id="geo_vector_view_tree">
<field name="name">geoengine.vector.layer.tree</field>
<field name="model">geoengine.vector.layer</field>
- <field name="type">tree</field>
<field name="arch" type="xml">
- <tree>
+ <tree string="Vector">
<field name="name" select="1"/>
<field name="geo_repr" select="1"/>
<field name="classification" select="1"/>
=== removed directory 'base_geoengine/images'
=== removed file 'base_geoengine/images/map-hover.png'
Binary files base_geoengine/images/map-hover.png 2012-12-07 17:21:33 +0000 and base_geoengine/images/map-hover.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'base_geoengine/images/map.png'
Binary files base_geoengine/images/map.png 2012-12-07 17:21:33 +0000 and base_geoengine/images/map.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'base_geoengine/static/src/css/style.css'
--- base_geoengine/static/src/css/style.css 2012-11-29 11:39:14 +0000
+++ base_geoengine/static/src/css/style.css 2013-09-20 16:37:54 +0000
@@ -195,21 +195,8 @@
}
/* Button style */
-.oe_vm_switch_geoengine{
- background: url("/base_geoengine/static/src/images/geoengine_switch.png");
- overflow: hidden;
- width: 22px;
- height: 21px;
- border: medium none;
- color: transparent;
- padding-bottom: 6px;
-}
-.oe_vm_switch_geoengine[disabled="disabled"] {
- background-position: 0px -21px;
-}
-
-.oe_vm_switch_geoengine {
- background-position: 0px -0px;
+.openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_geoengine:after {
+ content: "2";
}
/* Edit Widget */
=== removed file 'base_geoengine/static/src/images/geoengine_switch.png'
Binary files base_geoengine/static/src/images/geoengine_switch.png 2012-02-17 17:59:09 +0000 and base_geoengine/static/src/images/geoengine_switch.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'base_geoengine/static/src/js/geoengine_view.js'
--- base_geoengine/static/src/js/geoengine_view.js 2013-02-01 15:03:10 +0000
+++ base_geoengine/static/src/js/geoengine_view.js 2013-09-20 16:37:54 +0000
@@ -563,7 +563,7 @@
//------------ EDIT WIDGET ----------------------------------------------
- openerp.base_geoengine.FieldGeoEngineEditMap = openerp.web.form.Field.extend({
+ openerp.base_geoengine.FieldGeoEngineEditMap = openerp.web.form.AbstractField.extend({
template: 'FieldGeoEngineEditMap',
geo_type: null,
@@ -754,10 +754,10 @@
this.force_readonly = true;
}
});
- openerp.web.page.readonly.add('geo_edit_map', 'openerp.base_geoengine.FieldGeoEngineEditMapReadonly');
+ openerp.web.form.widgets.add('geo_edit_map', 'openerp.base_geoengine.FieldGeoEngineEditMapReadonly');
//-----------------------------------------------------------------------
- openerp.base_geoengine.FieldGeoPointXY = openerp.web.form.Field.extend({
+ openerp.base_geoengine.FieldGeoPointXY = openerp.web.form.AbstractField.extend({
template: 'FieldGeoPointXY',
start: function() {
@@ -842,9 +842,9 @@
this.invalid = false;
}
});
- openerp.web.page.readonly.add('geo_point_xy', 'openerp.base_geoengine.FieldGeoPointXYReadonly');
+ openerp.web.form.widgets.add('geo_point_xy', 'openerp.base_geoengine.FieldGeoPointXYReadonly');
- openerp.base_geoengine.FieldGeoRect = openerp.web.form.Field.extend({
+ openerp.base_geoengine.FieldGeoRect = openerp.web.form.AbstractField.extend({
template: 'FieldGeoRect',
start: function() {
@@ -971,7 +971,7 @@
this.invalid = false;
}
});
- openerp.web.page.readonly.add('geo_rect', 'openerp.base_geoengine.FieldGeoRectReadonly');
+ openerp.web.form.widgets.add('geo_rect', 'openerp.base_geoengine.FieldGeoRectReadonly');
//-------------------------------------------------------------------------
=== modified file 'base_geoengine/static/src/xml/geoengine.xml'
--- base_geoengine/static/src/xml/geoengine.xml 2012-12-05 10:31:47 +0000
+++ base_geoengine/static/src/xml/geoengine.xml 2013-09-20 16:37:54 +0000
@@ -36,7 +36,7 @@
<t t-name="FieldGeoPointXY.readonly">
<div
t-att-id="widget.element_id"
- t-attf-class="field_#{widget.type} #{_(['geo_point_xy']).contains(widget.type) ? 'oe-number' : ''}">
+ t-attf-class="field_#{widget.widget} #{_(['geo_point_xy']).contains(widget.type) ? 'oe-number' : ''}">
</div>
</t>
@@ -85,13 +85,13 @@
<t t-name="FieldGeoRect.readonly">
<div
t-att-id="widget.element_id"
- t-attf-class="field_#{widget.type} #{_(['geo_point_xy']).contains(widget.type) ? 'oe-number' : ''}">
+ t-attf-class="field_#{widget.widget} #{_(['geo_point_xy']).contains(widget.type) ? 'oe-number' : ''}">
</div>
</t>
<t t-name="FieldGeoEngineEditMap">
- <div t-att-id="widget.element_id" t-attf-class="field_#{widget.type}" border="1"/>
+ <div t-att-id="widget.element_id" t-attf-class="field_#{widget.widget}" border="1"/>
</t>
</template>
=== modified file 'base_geoengine_demo/retail_machine_view.xml'
--- base_geoengine_demo/retail_machine_view.xml 2013-02-01 15:03:10 +0000
+++ base_geoengine_demo/retail_machine_view.xml 2013-09-20 16:37:54 +0000
@@ -4,9 +4,8 @@
<record model="ir.ui.view" id="geo_retail_machine_view_form">
<field name="name">geoengine.demo.retail.machine.form</field>
<field name="model">geoengine.demo.automatic.retailing.machine</field>
- <field name="type">form</field>
<field name="arch" type="xml">
- <form>
+ <form string="Retail Machine">
<field name="name" colspan="4"/>
<notebook colspan="4">
<page string="Geometry">
@@ -26,9 +25,8 @@
<record model="ir.ui.view" id="geo_retail_machine_view_tree">
<field name="name">geoengine.demo.retail.machine.form</field>
<field name="model">geoengine.demo.automatic.retailing.machine</field>
- <field name="type">tree</field>
<field name="arch" type="xml">
- <tree>
+ <tree string="Retail Machine">
<field name="name" select="1"/>
<field name="total_sales" select="1"/>
<field name="money_level" select="1"/>
@@ -72,15 +70,15 @@
<!-- GeoEngine views -->
<record id="ir_ui_view_retailmachineview0" model="ir.ui.view">
<field name="name">Retail machine view</field>
- <field name="arch"><![CDATA[
-<form>
- <field name="name" select="1"/>
- <field name="total_sales" select="1"/>
- <field name="money_level" />
- <field name="state"/>
-</form>]]></field>
+ <field name="arch" type="xml">
+ <geoengine version="7.0">
+ <field name="name" select="1"/>
+ <field name="total_sales" select="1"/>
+ <field name="money_level" />
+ <field name="state"/>
+ </geoengine>
+ </field>
<field eval="16" name="priority"/>
- <field name="type">geoengine</field>
<field name="model">geoengine.demo.automatic.retailing.machine</field>
</record>
<record id="geoengine_vector_layer_retailmachinebasicpoint0" model="geoengine.vector.layer">
=== modified file 'base_geoengine_demo/zip_view.xml'
--- base_geoengine_demo/zip_view.xml 2013-02-01 15:03:10 +0000
+++ base_geoengine_demo/zip_view.xml 2013-09-20 16:37:54 +0000
@@ -4,9 +4,8 @@
<record model="ir.ui.view" id="dummy_zip_form">
<field name="name">dummy.zip.form</field>
<field name="model">dummy.zip</field>
- <field name="type">form</field>
<field name="arch" type="xml">
- <form>
+ <form string="Dummy">
<field name="name" select="1"/>
<field name="city" select="1"/>
<field name="priority" />
@@ -22,9 +21,8 @@
<record model="ir.ui.view" id="dummy_zip_tree">
<field name="name">dummy.zip.form</field>
<field name="model">dummy.zip</field>
- <field name="type">tree</field>
<field name="arch" type="xml">
- <tree>
+ <tree string="Dummy">
<field name="name" select="1"/>
<field name="city" select="1"/>
<field name="priority" />
@@ -43,14 +41,14 @@
<!-- GeoEngine views -->
<record id="ir_ui_view_resbetterzipgeoview0" model="ir.ui.view">
<field name="name">dummy.zip.geo_view</field>
- <field name="arch"><![CDATA[
- <form >
+ <field name="arch" type="xml">
+ <geoengine version="7.0">
<field name="name"/>
<field name="city"/>
<field name="total_sales"/>
- </form>]]></field>
+ </geoengine>
+ </field>
<field eval="16" name="priority"/>
- <field name="type">geoengine</field>
<field name="model">dummy.zip</field>
</record>
<record id="geoengine_vector_layer_basictest0" model="geoengine.vector.layer">
=== modified file 'geoengine_geoname_geocoder/__openerp__.py'
--- geoengine_geoname_geocoder/__openerp__.py 2012-10-01 10:26:49 +0000
+++ geoengine_geoname_geocoder/__openerp__.py 2013-09-20 16:37:54 +0000
@@ -23,12 +23,12 @@
'category': 'GeoBI',
'description': """ Automatically geocode addresses using http://www.geonames.org/ api.
We use this API because it is free and has little data usage restriction and do not require an account.
- The limitation is that address is localized by city not by street. For more precize localisation you have to
+ The limitation is that address is localized by city not by street. For more precize localisation you have to
use a non free API. Google maps APi limitation exclude the use of geocoded data in OpenERP.
- You can contact Camptocamp if you need to create a specific geocoder or acces geocoding services.
-
+ You can contact Camptocamp if you need to create a specific geocoder or acces geocoding services.
+
Technical notes:
- PostGIS must support projection (proj4)
+ PostGIS must support projection (proj4)
We use postgis to do the reprojection in order to avoid gdal python deps.
""",
'update_xml': ['company_view.xml', 'wizard/bulk_encode_view.xml'],
=== modified file 'geoengine_partner/__openerp__.py'
--- geoengine_partner/__openerp__.py 2012-10-01 10:27:35 +0000
+++ geoengine_partner/__openerp__.py 2013-09-20 16:37:54 +0000
@@ -22,7 +22,7 @@
'version': '0.1',
'category': 'GeoBI',
'description': """Add geo_point on partner and addresses
- point on partner is function field that return geo point of
+ point on partner is function field that return geo point of
""",
'update_xml': ['geo_partner_view.xml'],
'author': 'Camptocamp',
=== modified file 'geoengine_partner/geo_partner_view.xml'
--- geoengine_partner/geo_partner_view.xml 2012-02-02 22:08:18 +0000
+++ geoengine_partner/geo_partner_view.xml 2013-09-20 16:37:54 +0000
@@ -22,15 +22,15 @@
<!-- GeoEngine views -->
<record id="ir_ui_view_geo_partner_add" model="ir.ui.view">
<field name="name">Address view</field>
- <field name="arch"><![CDATA[
-<form>
- <field name="name" select="1"/>
- <field name="zip"/>
- <field name="city"/>
- <field name="country_id"/>
-</form>]]></field>
+ <field name="arch" type="xml">
+ <geoengine version="7.0">
+ <field name="name" select="1"/>
+ <field name="zip"/>
+ <field name="city"/>
+ <field name="country_id"/>
+ </geoengine>
+ </field>
<field eval="16" name="priority"/>
- <field name="type">geoengine</field>
<field name="model">res.partner.address</field>
</record>
@@ -89,15 +89,15 @@
<record id="ir_ui_view_geo_partner" model="ir.ui.view">
<field name="name">Partner view</field>
- <field name="arch"><![CDATA[
-<form>
- <field name="name" select="1"/>
- <field name="title" />
- <field name="function"/>
- <field name="website"/>
-</form>]]></field>
+ <field name="arch" type="xml">
+ <geoengine version="7.0">
+ <field name="name" select="1"/>
+ <field name="title" />
+ <field name="function"/>
+ <field name="website"/>
+ </geoengine>
+ </field>
<field eval="16" name="priority"/>
- <field name="type">geoengine</field>
<field name="model">res.partner</field>
</record>
=== modified file 'geoengine_sale/__openerp__.py'
--- geoengine_sale/__openerp__.py 2012-10-01 10:29:02 +0000
+++ geoengine_sale/__openerp__.py 2013-09-20 16:37:54 +0000
@@ -22,7 +22,7 @@
'version': '0.1',
'category': 'GeoBI',
'description': """Add geo_point on partner and addresses
- point on partner is function field that return geo point of
+ point on partner is function field that return geo point of
""",
'update_xml': ['geo_sale_view.xml'],
'author': 'Camptocamp',
@@ -34,4 +34,3 @@
'active': False,
'icon': '/base_geoengine/static/src/images/map_icon.png'}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
=== modified file 'geoengine_sale/geo_sale_view.xml'
--- geoengine_sale/geo_sale_view.xml 2012-02-16 13:14:44 +0000
+++ geoengine_sale/geo_sale_view.xml 2013-09-20 16:37:54 +0000
@@ -22,15 +22,15 @@
<!-- GeoEngine views -->
<record id="ir_ui_view_geo_sale_order" model="ir.ui.view">
<field name="name">Sale Order view</field>
- <field name="arch"><![CDATA[
-<form>
- <field name="name" select="1"/>
- <field name="partner_id"/>
- <field name="state"/>
- <field name="amount_total"/>
-</form>]]></field>
+ <field name="arch" type="xml">
+ <geoengine version="7.0">
+ <field name="name" select="1"/>
+ <field name="partner_id"/>
+ <field name="state"/>
+ <field name="amount_total"/>
+ </geoengine>
+ </field>
<field eval="16" name="priority"/>
- <field name="type">geoengine</field>
<field name="model">sale.order</field>
</record>
Follow ups
