magic_addresses 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4674980fd601311e241904da2a2b8a9f2d82acd4
-  data.tar.gz: 95c0308f82651ac16168daeb3bc9c19e79d88df6
+  metadata.gz: 3c017aed86d4158847822bd107b29a2f18f75274
+  data.tar.gz: 5b95f14b10e854200172bd3f6e12d3f1767d6ace
 SHA512:
-  metadata.gz: a42873312b5f2df808650f412e5a9d98168231e3ed1ef8881f6c3910c2b953d5374f917df5e5b693a34759b7abe6235305d4a5b216004eb97d6b2eb5421a266b
-  data.tar.gz: f074307b59af48748cd92cf18bb34f3e82a5e8cfd3b67af5093364ae056a7d7b48f2b3d0936210327f416c8fe2189836a100759e200def10414f6c486cfc1531
+  metadata.gz: a4a858f596f9f146ef71cb83e1940ff9df5bb1ef7eaf4e91e8433897e9d452767b9333e1e3e66a155b41d50d47bad574ee891598563ff843af2e022434c11c06
+  data.tar.gz: e3eb9a9531fdb02039125bc5e169abc04506c591aed459aa37c848f166b7e7cfebdab2e53fda3daf1527dbb57b3fbe48be55c31cdbb8d38f5b49fdc64d163452

data/app/views/magic_addresses/addresses/_address_fields.html.erb

@@ -3,7 +3,7 @@
 <% idkey = "locations_attributes_#{rand(999999)}_" %>
 <div class="map_form">
 	
-		<input type="text" id="<%= idkey %>map_data" class="mgca_map_data <%= style %>" placeholder="<%= placeholder %>" />
+		<input type="text" id="<%= idkey %>map_data" class="mgca_map_data <%= style %>" placeholder="<%= placeholder %>" value="<%= f.object.presentation %>" />
 		
 		<div class="hidden_mgca_form">
 		  <div class="row">
@@ -29,19 +29,12 @@
   		</div>
 		</div>
 		
-		
-		<%#= f.hidden_field :street, class: "mgca_txt street", id: "#{idkey}street" %>
-		<%#= f.hidden_field :street_number, class: "mgca_txt street_number", id: "#{idkey}street_number" %>
 		<%= f.hidden_field :latitude, id: "#{idkey}latitude", class: "mgca_latitude" %>
 		<%= f.hidden_field :longitude, id: "#{idkey}longitude", class: "mgca_longitude" %>
-		<%#= f.hidden_field :zip, class: "mgca_txt zip", id: "#{idkey}zip" %>
-		<%#= f.hidden_field :country, class: "mgca_txt country", id: "#{idkey}country" %>
 		<%= f.hidden_field :country_code, class: "mgca_txt country_code", id: "#{idkey}country_code" %>
 		<%= f.hidden_field :state, class: "mgca_txt state", id: "#{idkey}state" %>
-		<%#= f.hidden_field :city, class: "mgca_txt city", id: "#{idkey}city" %>
 		<%= f.hidden_field :district, class: "mgca_txt district", id: "#{idkey}district" %>
 		
-		
 		<div class="clearfix"></div>
 		<div id="<%= idkey %>preview_map" class="address_preview_map"></div>
 	

data/app/views/magic_addresses/addresses/_addresses_fields.html.erb

@@ -8,7 +8,7 @@
 	</div>
 	
 	<div class="fields">
-		<input type="text" id="<%= idkey %>map_data" class="mgca_short_data <%= style %>" placeholder="<%= placeholder %>"/>
+		<input type="text" id="<%= idkey %>map_data" class="mgca_short_data <%= style %>" placeholder="<%= placeholder %>" value="<%= f.object.presentation %>"/>
 		<%= f.hidden_field :street, class: "mgca_txt street", id: "#{idkey}street" %>
 		<%= f.hidden_field :street_number, class: "mgca_txt street_number", id: "#{idkey}street_number" %>
 		<%= f.hidden_field :latitude, id: "#{idkey}latitude", class: "mgca_latitude" %>

data/lib/app/models/magic_addresses/address.rb

@@ -94,7 +94,7 @@ class MagicAddresses::Address < ActiveRecord::Base
   
   def presentation( type = "inline" )
     adr = []
-    adr << "#{street} #{street_number}".strip if street.present?
+    adr << "#{street} #{number}".strip if street.present?
     adr << "#{postalcode} #{city}" if zipcode.present? || city.present?
     adr << "(#{country})" if country.present?
     if adr.count == 0
@@ -167,7 +167,7 @@ private
       # build street parameters
       street_params = []
       geo_data.each do |key, stuff|
-        street_params << { locale: key.to_s, street_name: stuff.street } if stuff.street && ((stuff.street != geo_data[default_locale].street) || (default_locale == key.to_s))
+        street_params << { locale: key.to_s, street_name: stuff.street } if stuff.street # && ((stuff.street != geo_data[default_locale].street) || (default_locale == key.to_s))
       end
       # set street parameters if present
       if street_params.any?
@@ -234,7 +234,7 @@ private
     lng_params = []
     geo_data.each do |key, stuff|
       dev_log "#{that.to_s.titleize}-Params (#{key}) ... #{stuff.send(that)}"
-      lng_params << { locale: key.to_s, name: stuff.send(that) } if stuff.send(that) && ((stuff.send(that) != geo_data[default_locale].send(that)) || (key.to_s == default_locale))
+      lng_params << { locale: key.to_s, name: stuff.send(that) } if stuff.send(that) # && ((stuff.send(that) != geo_data[default_locale].send(that)) || (key.to_s == default_locale))
     end
     lng_params
   end

data/lib/magic_addresses/version.rb

@@ -1,3 +1,3 @@
 module MagicAddresses
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_addresses
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Torsten Wetzel