mapplz 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4da45e726fdc80c0a4ce530e6522f31ed8c8035f
-  data.tar.gz: 5595cad9a95f0ec4b638c183d6f8f6c268ff4bab
+  metadata.gz: 92d4497b2e8222e35370a7aeaca0dfc3593c57a3
+  data.tar.gz: 5502f9355320e6e1031ba5c899e9f9fde2e64ff3
 SHA512:
-  metadata.gz: 6d204b6cc48b3803adb797ff19dbf9c15b4187b2db01dc13852264761abd7e4148f478e423414ef7f81ce8081aebc4a79b48d98aa6187c315f19d119f19c1669
-  data.tar.gz: 6e050eea53d3d0f6fd844eb0844267618fbde3a5130c9424a967126bcc99345e024fde465f34437b66cecfd6027b89a07495d6b9d5b3aa2314c08d77000d5685
+  metadata.gz: 29c33ccd32d999894c4fd7f32ec83624ff8531c73113118ce1d09146b1c746d843e17487a5fdecacb49cb45ce99efc00908b75759a170fc7bc2464a18a278a43
+  data.tar.gz: dbe113b6f61a0568538e52d7fecb99ffb6dab72e0284e0c5a230843a6c4191cc2da78fa737176b7718321c574649408f7de07f512cd3c78c6f39707416c423f8

data/README.md

@@ -3,21 +3,27 @@
 [MapPLZ](http://mapplz.com) is a framework to make mapping quick and easy in
 your favorite language.
 
+<img src="https://raw.githubusercontent.com/mapmeld/mapplz-ruby/master/logo.jpg" width="140"/>
+
 ## Getting started
 
-Extract, transform, and load geodata into MapPLZ:
+MapPLZ consumes many many types of geodata. It can process data for a script or dump
+it into a database.
+
+Here's how you can add some data:
 
 ```
 mapstore = MapPLZ.new
 
 # a point
 mapstore << [lat, lng]
-mapstore.add( [lat, lng] )
+mapstore << { lat: 40, lng: -70 }
+mapstore.add( [lng, lat], lonlat: true )
 
 # multiple points
 mapstore << [point1, point2]
 
-# a line or shape
+# a line or polygon
 mapstore << [[point1, point2, point3]]
 mapstore << [[point1, point2, point3, point1]]
 mapstore << { path: [point1, point2], label: 'hello world' }
@@ -41,9 +47,22 @@ mapstore << [lat, lng, { color: 'red', cost: 10 }]
 mapstore << { type: "Feature", geometry: { type: "Point", properties: { name: "Bella" }, coordinates: [lng, lat] } }
 ```
 
+MapPLZ can read GeoJSON files and some CSVs.
+
+```
+@mapstore < File.open('test.csv')
+@mapstore < File.open('test.geojson')
+```
+
+If you have gdal installed, you can import files in formats parseable by the ```ogr2ogr``` command line tool.
+
+```
+@mapstore < File.open('test.shp')
+```
+
 ## Export HTML and GeoJSON
 
-You can output the data anytime as GeoJSON:
+You can output the entire dataset anytime as GeoJSON:
 
 ```
 @mapper = MapPLZ.new
@@ -69,7 +88,7 @@ require 'mapplz'
 @mapper.render_html
 ```
 
-This is based on the Leaflet-Rails plugin. Set Leaflet defaults directly:
+This extends the Leaflet-Rails plugin. Set Leaflet defaults directly:
 
 ```
 Leaflet.tile_layer = 'http://{s}.somedomain.com/blabla/{z}/{x}/{y}.png'
@@ -82,7 +101,7 @@ You can pass options to render_html, including new default styles for lines and
 @mapper.render_html(max_zoom: 18, fillColor: '#00f')
 ```
 
-You can also add styles to your data as it's entered into the map datastore.
+You can also add styles as you enter data into MapPLZ.
 
 ```
 @mapper << { path: [point1, point2], color: 'red', opacity: 0.8 }
@@ -126,24 +145,10 @@ my_features = @mapper.where('points > 10')
 collection = { type: 'FeatureCollection', features: my_features.map { |feature| JSON.parse(feature.to_geojson) } }
 ```
 
-## Files
-
-MapPLZ can be passed a CSV or GeoJSON file.
-
-```
-@mapstore < File.open('test.csv')
-@mapstore < File.open('test.geojson')
-```
-
-If you have gdal installed, you can import files in most formats parseable by the ```ogr2ogr``` command line tool.
-
-```
-@mapstore < File.open('test.shp')
-```
-
 ## Databases
 
-You can store geodata in SQLite/Spatialite, Postgres/PostGIS, or MongoDB.
+If you want to store geodata in a database, you can use Postgres/PostGIS or MongoDB.
+SQLite/Spatialite support is written but untested.
 
 MapPLZ simplifies geodata management and queries.
 
@@ -154,9 +159,10 @@ mapplz.choose_db('postgis')
 ```
 
 ```
-# working with records
+# updating records
 pt = mapstore << [lat, lng]
-pt.name = "Sears Tower"
+pt[:name] = "Sears Tower"
+pt[:lat] += 1
 pt.save!
 pt.delete_item
 ```
@@ -180,7 +186,7 @@ conn.exec('CREATE TABLE mapplz (id SERIAL PRIMARY KEY, label VARCHAR(30), geom p
 mapstore = MapPLZ.new(conn)
 mapstore.choose_db('postgis')
 
-# Spatialite
+# Spatialite (written but untested)
 require 'sqlite3'
 db = SQLite3::Database.new('data/mapplz.sqlite')
 db.execute(".load 'libspatialite.so'")

data/lib/mapplz.rb

@@ -433,6 +433,14 @@ class MapPLZ
       # assume user properties are an ordered array of values known to the user
       user_properties = user_geo.drop(2)
 
+      # only one property and it's a string? check for JSON hash
+      if user_properties.length == 1 && user_properties[0].is_a?(String)
+        begin
+          user_properties[0] = JSON.parse(user_properties[0])
+        rescue
+        end
+      end
+
       # only one property and it's a hash? it's a hash of properties
       if user_properties.length == 1 && user_properties[0].is_a?(Hash)
         user_properties[0].keys.each do |key|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mapplz
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Nick Doiron