Changeset 1258

Timestamp:

10/30/08 10:27:54 (2 months ago)

Author:

elemoine

Message:

big refactoring of the feature editing panel
- setUp/tearDown implemented
- i18n
- only one vector layer used
- use Strategy.BBOX internally

Files:

• sandbox/camptocamp/MapFishUnhcr/client/examples/editing/editing-panel.html (modified) (3 diffs)
• sandbox/camptocamp/MapFishUnhcr/client/mfbase/mapfish/lang/en.js (modified) (1 diff)
• sandbox/camptocamp/MapFishUnhcr/client/mfbase/mapfish/widgets/editing/FeatureEditingPanel.js (modified) (22 diffs)
• sandbox/camptocamp/MapFishUnhcr/client/mfbase/mapfish/widgets/editing/FeatureOfflineManager.js (modified) (5 diffs)

sandbox/camptocamp/MapFishUnhcr/client/examples/editing/editing-panel.html

@@ -92 +92 @@
-                    )
-                }),
-                strategy: new OpenLayers.Strategy.BBOX({
-                    tileSize: new OpenLayers.Size(256, 256)
-                }),
-                featuretypes: {
-                    geometry: {
@@ -111 +108 @@
-                        mapfish.SERVER_BASE_URL + 'lines'
-                    )
-                }),
-                strategy: new OpenLayers.Strategy.BBOX({
-                    tileSize: new OpenLayers.Size(256, 256)
-                }),
-                featuretypes: {
@@ -132 +126 @@
-                        mapfish.SERVER_BASE_URL + 'points'
-                    )
-                }),
-                strategy: new OpenLayers.Strategy.BBOX({
-                    tileSize: new OpenLayers.Size(256, 256)
-                }),
-                featuretypes: {

sandbox/camptocamp/MapFishUnhcr/client/mfbase/mapfish/lang/en.js

@@ -23 +23 @@
-    'mf.error': 'Error',
-    'mf.warning': 'Warning',
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-});

sandbox/camptocamp/MapFishUnhcr/client/mfbase/mapfish/widgets/editing/FeatureEditingPanel.js

@@ -37 +37 @@
-
-    /**
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-     */
-    map: null,
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-     */
-    layerConfig: null,
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    /**
-     * Property: store
-
+ The feature store for the grid.
-     */
-    store: null,
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /**
-     * Property: modifyControl
-
-
-
+
+
+
+
-
-    /**
-     * Property: drawFeatureControl
-
+ The draw feature control.
-     */
-    drawFeatureControl: null,
@@ -133 +157 @@
-    /**
-     * Property: importBtn
-- Reference to the import button
+The import button.
-     */
-    importBtn: null,
@@ -139 +163 @@
-    /**
-     * Property: commitBtn
-- Reference to the commit button
+Rhe commit button.
-     */
-    commitBtn: null,
@@ -145 +169 @@
-    /**
-     * Property: deleteBtn
-- Reference to the delete button
+The delete button.
-     */
-    deleteBtn: null,
-
-    /**
+     * Property: attributesFormDefaults
+     * {Ext.data.Record} A record representing default attributes
+     * in the form.
+     */
+    attributesFormDefaults: null,
+
+    /**
-     * Method: initComponent
-     
+
-     */
-    initComponent: function() {
-        // sanity checks
-        if (!this.map) {
-            OpenLayers.Console.error(
-Mandatory param for FeatureEditingPanel missing: map
+map option for FeatureEditingPanel missing
-        }
-        if (!this.layerConfig) {
-            OpenLayers.Console.error(
-Mandatory param for FeatureEditingPanel missing: layerConfi
+layerConfig option for FeatureEditingPanel missin
-        }
-
-        this.layout = 'form';
-
-
-
-
-
-
+
-
-        mapfish.widgets.editing.FeatureEditingPanel.superclass.initComponent.apply(this);
-
-window.onbeforeunload = (function(e) {
-
-        return "There are unsaved changes!"
-
-}).createDelegate(
-
-
-    /**
-     * @event beforecommit
-     * Triggered when the commit button is hit and
-
-     */
-    'beforecommit',
-    /**
-
-     * Triggered when the commit is done.
-         */
-
-    );
-},
-
-/*
-Method: initToolbar
-
-
-init
+this.add(this.createLayerCombo());
+
+this.on("destroy", this.destroyResources, this)
+
+this.on("enable", this.setUp, 
+
+
+// for accordion
+this.on('expand', this.setUp, this);
+this.on('collapse', this.tearDown, this);
+
+// for tabs
+this.on('activate', this.setUp, this);
+this.on('deactivate', this.tearDown, this);
+
+this.addEvents('beforecommit', 'commit');
+},
+
+/**
+ * Method: createToolbar
+
+ 
+Returns:
+ {<mapfish.widgets.toolbar.Toolbar>} MapFish toolbar.
+
+create
-        this.importBtn = new Ext.Button({
-'Import'
-'Import data for the current layer and extent'
+OpenLayers.i18n("mf.editing.import")
+OpenLayers.i18n("mf.editing.importTooltip")
-            disabled: true,
-            handler: function() {
@@ -210 +235 @@
-        });
-        this.commitBtn = new Ext.Button({
-'Commit'
-'Commit features'
+OpenLayers.i18n("mf.editing.commit")
+OpenLayers.i18n("mf.editing.commitTooltip")
-            disabled: true,
-            handler: function() {
@@ -219 +244 @@
-        });
-        this.deleteBtn = new Ext.Button({
-'Delete'
-'Delete selected features'
+OpenLayers.i18n("mf.editing.delete")
+OpenLayers.i18n("mf.editing.deleteTooltip")
-            disabled: true,
-            handler: function() {
-                var toDelete = this.deleteFeatures();
-
+
+
-            },
-            scope: this
@@ -235 +261 @@
-            this.deleteBtn
-        ];
-
-
+
-            items: buttons,
-            map: this.map
-        });
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (this.isDirty()) {
-'Edited features',
-'There are uncommited updates. Are ' +
-'you sure you want to change the editing layer.'
+
+OpenLayers.i18n("mf.editing.confirmMessageTitle"),
+OpenLayers.i18n("mf.editing.confirmMessage")
-                function(btn, text){
-
-
-
+
+
-                    } else {
-layersCombo.setValue(this.currentLayer.name
+combo.setValue(this.currentLayerId
-                    }
-                },
- // scope
+
-            );
-        } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    },
-
-    /**
-     * Method: createLayer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        // create a styleMap for the vector layer so that features
-        // have different styles depending on their state
-        // FIXME: the lookup should be given as an option in constructor
-        var context = function(feature) {
-            return {
-                state: feature.state || OpenLayers.State.UNKNOWN
-            };
-
-
+
-        var lookup = {
-            "Unknown": {},
@@ -358 +534 @@
-                strokeColor: "green"
-            }
-
+;
-        styleMap.addUniqueValueRules("default", "state", lookup, context);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        var fields = [];
-this.layerConfig[layer]
+config
-        for (var i = 0; i < properties.length; i++) {
-            fields.push(properties[i].getRecordType());
-        }
-
-
+
-            reader: new mapfish.widgets.data.FeatureReader(
-                {}, fields
@@ -494 +595 @@
-            groupField: "state"
-        });
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+