svn commit: r1553952 - in /ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./ framework/common/webcommon/WEB-INF/actions/includes/ specialpurpose/example/widget/example/

Author: jleroux
Date: Sat Dec 28 22:37:21 2013
New Revision: 1553952

URL: http://svn.apache.org/r1553952
Log:
During last trunk HEAD merging, I forgot I was working on GeoLocation in this working copy branch and I committed changes that should not be

Modified:
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/   (props changed)
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/actions/includes/GeoLocation.groovy
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/CommonScreens.xml
    ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleScreens.xml

Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1553940-1553944

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/actions/includes/GeoLocation.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/actions/includes/GeoLocation.groovy?rev=1553952&r1=1553951&r2=1553952&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/actions/includes/GeoLocation.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/actions/includes/GeoLocation.groovy Sat Dec 28 22:37:21 2013
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-if (context.geoChart.points) {    
-    //context.geoChart.points = ;
-    println "context.geoChart.points==========================================" + context.geoChart.points
+if (geoPoint && geoPoint.elevationUomId) {
+    elevationUom = delegator.findOne("Uom", [uomId : geoPoint.elevationUomId], false);
+    context.elevationUomAbbr = elevationUom.abbreviation;
 }
-if (geoPoints) {    
-    println "geoPoints==========================================" + geoPoints
-}
-

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/CommonScreens.xml?rev=1553952&r1=1553951&r2=1553952&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/CommonScreens.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/CommonScreens.xml Sat Dec 28 22:37:21 2013
@@ -193,7 +193,6 @@ under the License.
                 <set field="geoChart.height" value="500px"/>
                 <set field="geoChart.points" from-field="geoPoints"/>
                 <set field="geoChart.center" from-field="geoCenter"/>
-                <script location="component://common/webcommon/WEB-INF/actions/includes/GeoLocation.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleScreens.xml?rev=1553952&r1=1553951&r2=1553952&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleScreens.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleScreens.xml Sat Dec 28 22:37:21 2013
@@ -165,7 +165,7 @@ under the License.
         <section>
             <actions>
                 <set field="tabButtonItem" value="ExampleGeoLocationPointSet1"/>
-                <set field="geoPoints[+0].lat" value="37,4459" type="Float"/>
+                <set field="geoPoints[+0].lat" value="37.4419" type="Float"/>
                 <set field="geoPoints[0].lon" value="-122.1419" type="Float"/>
                 <set field="geoPoints[+1].lat" value="37.4819" type="Float"/>
                 <set field="geoPoints[1].lon" value="-122.1519" type="Float"/>
@@ -184,7 +184,7 @@ under the License.
         <section>
             <actions>
                 <set field="tabButtonItem" value="ExampleGeoLocationPointSet2"/>
-                <set field="geoPoints[+0].lat" value="37.4419" type="Float"/>
+                <set field="geoPoints[+0].lat" value="37.4459" type="Float"/>
                 <set field="geoPoints[0].lon" value="-122.1489" type="Float"/>
                 <set field="geoPoints[+1].lat" value="37.4829" type="Float"/>
                 <set field="geoPoints[1].lon" value="-122.1599" type="Float"/>
@@ -193,7 +193,6 @@ under the License.
                 <set field="geoCenter.lat" value="37.4419" type="Float"/>
                 <set field="geoCenter.lon" value="-122.1419" type="Float"/>
                 <set field="geoCenter.zoom" value="12"/>
-                <script location="component://common/webcommon/WEB-INF/actions/includes/GeoLocation.groovy"/>
             </actions>
             <widgets>
                 <include-screen name="CommonExampleGeoLocationDecorator" location="${parameters.mainDecoratorLocation}"/>