Changeset 3830

Timestamp:

07/07/11 10:17:34 (11 months ago)

Author:

pka

Message:

JSON output fixed for Rails 2.3.3+

Location:

implementations/rails-plugin/mapfish/trunk

Files:

• .gitignore (added)
• README (modified) (1 diff)
• VERSION (modified) (1 diff)
• lib/geojson.rb (modified) (3 diffs)
• mapfish.gemspec (modified) (1 diff)

implementations/rails-plugin/mapfish/trunk/README

@@ -81 +81 @@
   rails runner "Geonames::Weather.weather(:north => 44.1, :south => -9.9, :east => -22.4, :west => 55.2).each { |st| WeatherStation.create(:name => st.stationName, :geom => Point.from_x_y(st.lng, st.lat)) }"
 
-(needs lib/geonames.rb from http://github.com/pka/map_layers/tree in lib/)
+(needs lib/geonames.rb from http://github.com/pka/map_layers/raw/master/lib/geonames.rb)
 
 Create a resource for an existing table::

implementations/rails-plugin/mapfish/trunk/VERSION

@@ -1 @@
-1.3.5
+1.3.6

implementations/rails-plugin/mapfish/trunk/lib/geojson.rb

@@ -59 +59 @@
     end  
     class Point
-      def to_json(options = nil)
+      def as_json(options = nil)
         {:type => "Point", 
-          :coordinates => [self.x, self.y]}.to_json(options)
+          :coordinates => [self.x, self.y]}.as_json(options)
       end
     end  
     class LineString
-      def to_json(options = nil)
+      def as_json(options = nil)
         coords = self.points.collect {|point| [point.x, point.y] }
         {:type => "LineString", 
-          :coordinates => coords}.to_json(options)
+          :coordinates => coords}.as_json(options)
       end
     end 
     class Polygon
-      def to_json(options = nil)
+      def as_json(options = nil)
         coords = self.collect {|ring| ring.points.collect {|point| [point.x, point.y] } }
         {:type => "Polygon", 
-          :coordinates => coords}.to_json(options)
+          :coordinates => coords}.as_json(options)
       end
     end
     class MultiPoint
-      def to_json(options = nil)
+      def as_json(options = nil)
         coords = self.geometries.collect {|geom| [geom.x, geom.y] }
         {:type => "MultiPoint", 
-          :coordinates => coords}.to_json(options)
+          :coordinates => coords}.as_json(options)
       end
     end 
     class MultiLineString
-      def to_json(options = nil)
+      def as_json(options = nil)
         coords = self.geometries.collect {|geom| geom.points.collect {|point| [point.x, point.y] } }
         {:type => "MultiLineString", 
-          :coordinates => coords}.to_json(options)
+          :coordinates => coords}.as_json(options)
       end
     end 
     class MultiPolygon
-      def to_json(options = nil)
+      def as_json(options = nil)
         coords = self.geometries.collect {|geom| geom.collect {|ring| ring.points.collect {|point| [point.x, point.y] } } }
         {:type => "MultiPolygon", 
-          :coordinates => coords}.to_json(options)
+          :coordinates => coords}.as_json(options)
       end
     end 
     class GeometryCollection
-      def to_json(options = nil)
+      def as_json(options = nil)
         {:type => "GeometryCollection", 
-          :geometries => self.geometries}.to_json(options)
+          :geometries => self.geometries}.as_json(options)
       end
     end
@@ -117 +117 @@
       end
 
-      def to_json(options = nil)
+      def as_json(options = nil)
         result={:type=>"Feature",
           :geometry=>@geometry,
           :properties=>@properties}
         result[:id]=@id if @id!=nil
-        return result.to_json(options)
+        return result.as_json(options)
       end
 
@@ -140 +140 @@
       end
 
-      def to_json(options = nil)
+      def as_json(options = nil)
         {:type=>"FeatureCollection",
-          :features=>@features}.to_json(options)
+          :features=>@features}.as_json(options)
       end
 

implementations/rails-plugin/mapfish/trunk/mapfish.gemspec

@@ -1 +1 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{mapfish}
-  s.version = "1.3.5"
+  s.version = "1.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pirmin Kalberer"]
-  s.date = %q{2010-06-19}
+  s.date = %q{2011-07-07}
   s.description = %q{MapFish is a flexible and complete framework for building rich web-mapping applications. Homepage: mapfish.org}
   s.email = %q{pka@sourcepole.ch}
   s.files = [
+    ".gitignore",
     "COPYING.LESSER",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "init.rb",
-     "install.rb",
-     "lib/generators/mapfish/print_controller/USAGE",
-     "lib/generators/mapfish/print_controller/print_controller_generator.rb",
-     "lib/generators/mapfish/print_controller/templates/config.yaml",
-     "lib/generators/mapfish/print_controller/templates/controller.rb",
-     "lib/generators/mapfish/resource/USAGE",
-     "lib/generators/mapfish/resource/resource_generator.rb",
-     "lib/generators/mapfish/resource/templates/controller.rb",
-     "lib/geojson.rb",
-     "lib/mapfish.rb",
-     "lib/mapfish_core_extensions/active_record/base.rb",
-     "lib/mapfish_core_extensions/array.rb",
-     "lib/print.rb",
-     "lib/tasks/mapfish_tasks.rake",
-     "mapfish.gemspec",
-     "print/print-standalone.jar",
-     "test/geojson_test.rb",
-     "uninstall.rb"
+    "README",
+    "Rakefile",
+    "VERSION",
+    "init.rb",
+    "install.rb",
+    "lib/generators/mapfish/print_controller/USAGE",
+    "lib/generators/mapfish/print_controller/print_controller_generator.rb",
+    "lib/generators/mapfish/print_controller/templates/config.yaml",
+    "lib/generators/mapfish/print_controller/templates/controller.rb",
+    "lib/generators/mapfish/resource/USAGE",
+    "lib/generators/mapfish/resource/resource_generator.rb",
+    "lib/generators/mapfish/resource/templates/controller.rb",
+    "lib/geojson.rb",
+    "lib/mapfish.rb",
+    "lib/mapfish_core_extensions/active_record/base.rb",
+    "lib/mapfish_core_extensions/array.rb",
+    "lib/print.rb",
+    "lib/tasks/mapfish_tasks.rake",
+    "mapfish.gemspec",
+    "print/print-standalone.jar",
+    "test/geojson_test.rb",
+    "uninstall.rb"
   ]
   s.homepage = %q{http://mapfish.org/doc/implementations/rails.html}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}