diff options
| author | Vlatka Pavisic | 2017-02-13 17:39:30 +0100 | 
|---|---|---|
| committer | Vlatka Pavisic | 2017-02-13 17:39:36 +0100 | 
| commit | 49c1de150c9ef38c00247a51b91150efdd5cc3dc (patch) | |
| tree | c9e4832efa0c55dea4889842adf5b407d37d1425 /app/views/api | |
| parent | 55468b29bb5b23bfeb8ebe439ed62e5214284a3d (diff) | |
| download | chouette-core-49c1de150c9ef38c00247a51b91150efdd5cc3dc.tar.bz2 | |
Refs #2596 : Replace creation_time with timestamps
Diffstat (limited to 'app/views/api')
| -rw-r--r-- | app/views/api/kml/access_links/index.kml.slim | 8 | ||||
| -rw-r--r-- | app/views/api/kml/access_points/index.kml.slim | 10 | ||||
| -rw-r--r-- | app/views/api/kml/connection_links/index.kml.slim | 6 | ||||
| -rw-r--r-- | app/views/api/kml/journey_patterns/show.kml.slim | 12 | ||||
| -rw-r--r-- | app/views/api/kml/lines/show.kml.slim | 8 | ||||
| -rw-r--r-- | app/views/api/kml/routes/show.kml.slim | 2 | ||||
| -rw-r--r-- | app/views/api/kml/stop_areas/index.kml.slim | 8 | ||||
| -rw-r--r-- | app/views/api/v1/trident_objects/show.rabl | 2 | 
8 files changed, 28 insertions, 28 deletions
| diff --git a/app/views/api/kml/access_links/index.kml.slim b/app/views/api/kml/access_links/index.kml.slim index f402a7aa4..1bcfdacf1 100644 --- a/app/views/api/kml/access_links/index.kml.slim +++ b/app/views/api/kml/access_links/index.kml.slim @@ -1,14 +1,14 @@  doctype XML -kml xmlns="http://www.opengis.net/kml/2.2"  +kml xmlns="http://www.opengis.net/kml/2.2"    document      name = h(Chouette::AccessLink.model_name.human) -     +      - @access_links.each do |access_link|        placemark id="#{access_link.objectid}"          name = h(access_link.name)          extendeddata -          - [ :access_link_type, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs, :link_orientation].each do |prop| +          - [ :access_link_type, :objectid, :object_version, :created_at, :updated_at, :creator_id, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs, :link_orientation].each do |prop|              data name="#{prop.to_s}"                value = h(access_link.send( prop)) @@ -18,4 +18,4 @@ kml xmlns="http://www.opengis.net/kml/2.2"            data name="stop_area_objectid"              value = h(access_link.stop_area.objectid) -        = access_link.geometry_presenter.geometry.kml_representation.html_safe
\ No newline at end of file +        = access_link.geometry_presenter.geometry.kml_representation.html_safe diff --git a/app/views/api/kml/access_points/index.kml.slim b/app/views/api/kml/access_points/index.kml.slim index 4f47272e6..1a162f7ed 100644 --- a/app/views/api/kml/access_points/index.kml.slim +++ b/app/views/api/kml/access_points/index.kml.slim @@ -1,19 +1,19 @@  doctype XML -kml xmlns="http://www.opengis.net/kml/2.2"  +kml xmlns="http://www.opengis.net/kml/2.2"    document      name = h(Chouette::AccessPoint.model_name.human)      name access -     +      - @access_points.each do |access_point|        placemark id="#{access_point.objectid}"          name = h(access_point.name)          extendeddata -          - [ :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :openning_time, :closing_time, :access_type, :access_point_type, :mobility_restricted_suitability, :stairs_availability, :lift_availability].each do |prop| +          - [ :objectid, :object_version, :creator_id, :created_at, :updated_at, :name, :comment, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :openning_time, :closing_time, :access_type, :access_point_type, :mobility_restricted_suitability, :stairs_availability, :lift_availability].each do |prop|              data name="#{prop.to_s}"                value = h(access_point.send( prop))            data name="stop_area_objectid"              value = h(access_point.stop_area.objectid) -   -        = access_point.geometry_presenter.geometry.kml_representation.html_safe
\ No newline at end of file + +        = access_point.geometry_presenter.geometry.kml_representation.html_safe diff --git a/app/views/api/kml/connection_links/index.kml.slim b/app/views/api/kml/connection_links/index.kml.slim index b5a6e9560..7305fbc78 100644 --- a/app/views/api/kml/connection_links/index.kml.slim +++ b/app/views/api/kml/connection_links/index.kml.slim @@ -1,6 +1,6 @@  doctype XML -kml xmlns="http://www.opengis.net/kml/2.2"  +kml xmlns="http://www.opengis.net/kml/2.2"    document      name = h(Chouette::ConnectionLink.model_name.human) @@ -8,7 +8,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"        placemark id="#{connection_link.objectid}"          name = h(connection_link.name)          extendeddata -          - [ :connection_link_type, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop| +          - [ :connection_link_type, :objectid, :object_version, :creator_id, :created_at, :updated_at, :name, :comment, :link_distance, :link_type, :default_duration, :frequent_traveller_duration, :occasional_traveller_duration, :mobility_restricted_traveller_duration, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop|              data name="#{prop.to_s}"                value = h(connection_link.send( prop)) @@ -18,4 +18,4 @@ kml xmlns="http://www.opengis.net/kml/2.2"            data name="arrival_objectid"              value = h(connection_link.arrival.objectid) -        = connection_link.geometry_presenter.geometry.kml_representation.html_safe
\ No newline at end of file +        = connection_link.geometry_presenter.geometry.kml_representation.html_safe diff --git a/app/views/api/kml/journey_patterns/show.kml.slim b/app/views/api/kml/journey_patterns/show.kml.slim index f7e6dc9f4..15fb96daa 100644 --- a/app/views/api/kml/journey_patterns/show.kml.slim +++ b/app/views/api/kml/journey_patterns/show.kml.slim @@ -1,10 +1,10 @@  doctype XML -kml xmlns="http://www.opengis.net/kml/2.2"  +kml xmlns="http://www.opengis.net/kml/2.2"    document      name = "#{h(Chouette::JourneyPattern.model_name.human)} : #{h(@journey_pattern.name)}"      extendeddata -      - [:objectid, :object_version, :creation_time, :creator_id, :name, :comment, :registration_number, :published_name].each do |prop| +      - [:objectid, :object_version, :creator_id, :created_at, :updated_at, :name, :comment, :registration_number, :published_name].each do |prop|          data name="#{prop.to_s}"            value = h(@journey_pattern.send( prop)) @@ -17,15 +17,15 @@ kml xmlns="http://www.opengis.net/kml/2.2"          placemark id="#{stop_area.objectid}"            name = h(stop_area.name)            extendeddata -            - [ :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop| +            - [ :objectid, :object_version, :creator_id, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop|                data name="#{prop.to_s}"                  value = h(stop_area.send( prop)) -               +              - if stop_area.parent                data name="parent_objectid"                  value = h(stop_area.parent.objectid) -             +              data name="stop"                value = @journey_pattern.stop_points.include?( stop_point) ? "true" : "false" -          = stop_area.geometry_presenter.geometry.kml_representation.html_safe
\ No newline at end of file +          = stop_area.geometry_presenter.geometry.kml_representation.html_safe diff --git a/app/views/api/kml/lines/show.kml.slim b/app/views/api/kml/lines/show.kml.slim index d314b8f19..d1e48323d 100644 --- a/app/views/api/kml/lines/show.kml.slim +++ b/app/views/api/kml/lines/show.kml.slim @@ -1,13 +1,13 @@  doctype XML -kml xmlns="http://www.opengis.net/kml/2.2"  +kml xmlns="http://www.opengis.net/kml/2.2"    document      name = "#{h(Chouette::Line.model_name.human)} : #{h(@line.name)}" -     +      placemark id="#{@line.objectid}"        name = h(@line.name)        extendeddata -        - [ :transport_mode, :objectid, :object_version, :creation_time, :creator_id, :name, :number, :published_name, :registration_number, :comment, :mobility_restricted_suitability, :int_user_needs].each do |prop| +        - [ :transport_mode, :objectid, :created_at, :updated_at, :object_version, :creator_id, :name, :number, :published_name, :registration_number, :comment, :mobility_restricted_suitability, :int_user_needs].each do |prop|            data name="#{prop.to_s}"              value = h(@line.send( prop)) @@ -17,4 +17,4 @@ kml xmlns="http://www.opengis.net/kml/2.2"          data name="network_objectid"            value = h(@line.network.objectid) -      = @line.geometry_presenter.geometry.kml_representation.html_safe
\ No newline at end of file +      = @line.geometry_presenter.geometry.kml_representation.html_safe diff --git a/app/views/api/kml/routes/show.kml.slim b/app/views/api/kml/routes/show.kml.slim index 51d2817c8..8a2843bc0 100644 --- a/app/views/api/kml/routes/show.kml.slim +++ b/app/views/api/kml/routes/show.kml.slim @@ -6,7 +6,7 @@ kml xmlns="http://www.opengis.net/kml/2.2"      placemark id="#{@route.objectid}"        name = h(@route.name)        extendeddata -        - [:direction, :wayback, :objectid, :object_version, :creation_time, :creator_id, :name, :comment, :published_name, :number, :direction_text, :wayback_text].each do |prop| +        - [:direction, :wayback, :objectid, :object_version, :creator_id, :created_at, :updated_at, :name, :comment, :published_name, :number, :direction_text, :wayback_text].each do |prop|            data name="#{prop.to_s}"              value = h(@route.send( prop)) diff --git a/app/views/api/kml/stop_areas/index.kml.slim b/app/views/api/kml/stop_areas/index.kml.slim index 64f7e08be..a08dbf963 100644 --- a/app/views/api/kml/stop_areas/index.kml.slim +++ b/app/views/api/kml/stop_areas/index.kml.slim @@ -1,14 +1,14 @@  doctype XML -kml xmlns="http://www.opengis.net/kml/2.2"  +kml xmlns="http://www.opengis.net/kml/2.2"    document      name = h( I18n.t("area_types.#{@area_type.underscore}") ) -     +      - @stop_areas.select { |sa| sa.latitude && sa.longitude}.each do |stop_area|        placemark id="#{stop_area.objectid}"          name =  h(stop_area.name)          extendeddata -          - [:objectid, :object_version, :creation_time, :creator_id, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop| +          - [:objectid, :object_version, :creator_id, :created_at, :updated_at, :name, :comment, :area_type, :registration_number, :nearest_topic_name, :fare_code, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs].each do |prop|              data name="#{prop.to_s}"                value = h(stop_area.send( prop)) @@ -16,4 +16,4 @@ kml xmlns="http://www.opengis.net/kml/2.2"              data name="parent_objectid"                value = h(stop_area.parent.objectid) -        = stop_area.geometry_presenter.geometry.kml_representation.html_safe
\ No newline at end of file +        = stop_area.geometry_presenter.geometry.kml_representation.html_safe diff --git a/app/views/api/v1/trident_objects/show.rabl b/app/views/api/v1/trident_objects/show.rabl index 7d58d9a55..e53a791ef 100644 --- a/app/views/api/v1/trident_objects/show.rabl +++ b/app/views/api/v1/trident_objects/show.rabl @@ -1,5 +1,5 @@  attributes :objectid => :object_id -[ :object_version, :creation_time, :creator_id].each do |attr| +[ :object_version, :created_at, :updated_at, :creator_id].each do |attr|    attributes attr, :unless => lambda { |m| m.send( attr).nil?}  end | 
