leaflet-ruby 0.3.beta1 → 0.3.beta3

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = leaflet-ruby Changelog
 
-=== 0.3.beta1
+=== 0.3.beta3
+* Remove zerista_layer.js to remove depedency on jQuery.
+
+=== 0.3.beta2
+* Withdrawn
 
+=== 0.3.beta1
 * First release, wraps the current master version of Leaflet 0.3 which is not yet released.

data/leaflet-ruby.gemspec

@@ -1,7 +1,7 @@
 # encoding: utf-8
 Gem::Specification.new do |spec|
   spec.name        = 'leaflet-ruby'
-  spec.version     = '0.3.beta1'
+  spec.version     = '0.3.beta3'
   spec.homepage    = 'https://github.com/cfis/leaflet-ruby'
   spec.summary     = <<-EOS
 Wraps the Leaflet Javascript Mapping Library in a Rails asset gem.  For more information

data/lib/leaflet-ruby.rb

@@ -1,10 +1,6 @@
 module Leaflet
   class Engine < Rails::Engine
     initializer :append_assets_path do |app|
-      puts 1111111111111
-      puts config.root
-      puts File.join(config.root, 'lib')
-      
       # For javascripts
       app.config.assets.paths << File.join(config.root, 'lib', 'leaflet', 'src')
       

data/vendor/assets/javascripts/leaflet.js

@@ -136,4 +136,3 @@
 // Zerista additions
 //=require ../../../lib/zerista/CRS.Cartesian.js
 //=require ../../../lib/zerista/Projection.Identity.js
-//=require ../../../lib/zerista/zerista_layer.js

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leaflet-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.beta1
+  version: 0.3.beta3
   prerelease: 4
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000 Z
+date: 2012-01-17 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
@@ -25,7 +25,6 @@ files:
 - lib/leaflet-ruby.rb
 - lib/zerista/CRS.Cartesian.js
 - lib/zerista/Projection.Identity.js
-- lib/zerista/zerista_layer.js
 - lib/leaflet/build/build.html
 - lib/leaflet/build/build.js
 - lib/leaflet/build/deps.js

data/lib/zerista/zerista_layer.js

@@ -1,97 +0,0 @@
-
-L.Zerista = L.GeoJSON.extend({
-  includes: L.Mixin.Events,
-
-  initialize: function(uri, options) {
-    L.Util.setOptions(this, options);
-    this._uri = uri;
-    this._layers = {};
-    this._options = options;
-
-    if (uri) {
-//      this.addFeatures(this);
-    }
-  },
-
-  addFeatures: function($this) {
-    $this.on('featureparse', function(e) {
-      var popupText = e.properties.display_value;
-      e.layer.bindPopup(popupText);
-    });
-  },
-
-	onAdd: function(map) {
-		this._map = map;
-		this._iterateLayers(map.addLayer, map);
-    this._update();
-  },
-
-  _update: function() {
-    var self = this
-    $.getJSON(self._uri, function(data)
-    {
-      self.addGeoJSONWithIcon(data);
-    });
-  },
-
-  addGeoJSONWithIcon: function(geojson) {
-    if (geojson.features) {
-      for (var i = 0, len = geojson.features.length; i < len; i++) {
-        this.addGeoJSONWithIcon(geojson.features[i]);
-      }
-      return;
-    }
-    var popupText = "<div class='popup_title'>";
-    var icon = geojson.properties.icon
-
-    if (icon) {
-      popupText += "<img src='/icons_user/" + icon.versions['medium-64'] + "' class='popup_image'>";
-      var iconUrl = '/icons_user/' + icon.versions['small-32'];
-      var MyIcon = L.Icon.extend({iconUrl: iconUrl,
-                                  iconSize: new L.Point(32, 32),
-                                  shadowSize: new L.Point(0, 0),
-                                  shadowUrl: ''});
-
-      var layer = this.geometryToLayer(geojson.geometry, function(latLng) {
-        return new L.Marker(latLng, {icon: new MyIcon()})
-      });
-
-    }
-    else {
-      var layer = this.geometryToLayer(geojson.geometry)
-    }
-
-    popupText += "<h3 class='ui-li-heading'>" + (geojson.link ? geojson.link : geojson.properties.display_value) + "</h3>" + (geojson.by ? ("<p class='ui-li-desc'> By " + geojson.by + "</p>") : '') + "</div>";
-    
-    if(geojson.properties.article != null )
-      popupText += "<div class='popup_article'><p class='ui-li-desc'>" + geojson.properties.article['content'] + "</p></div>";
-    
-    layer.bindPopup(popupText,{maxWidth: ($(window).width() - 50 )});
-    
-    if(geojson.properties.id == this._options.active_id  && geojson.geometry.type != 'Point'){
-      layer.setStyle({color: this._options.active_color})
-    }
-    
-    this.fire('featureparse', {
-      layer: layer,
-      properties: geojson.properties,
-      geometryType: geojson.geometry.type,
-      bbox: geojson.bbox,
-      id: geojson.id
-    });
-      
-    this.addLayer(layer);
-  },
-
-	coordsToLatLng: function(/*Array*/ coords, /*Boolean*/ reverse)/*: LatLng*/ {
-		var lat = parseFloat(coords[reverse ? 0 : 1]),
-			lng = parseFloat(coords[reverse ? 1 : 0]);
-    var noWrap = true;
-		return new L.LatLng(lat, lng, noWrap);
-	}
-});
-
-L.Util.extend(L.Zerista.prototype, {
-  	geometryToLayer: L.GeoJSON["geometryToLayer"],
-  	coordsToLatLngs: L.GeoJSON["coordsToLatLngs"]
-})