aixm 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 893b141929be3f77025e38496a060f415c2262e48d0ef102ad4da84e601e4ff4
-  data.tar.gz: fb65d43a1d2493b1ceadffdf9c8a0671cb8bb46dc5be026c538d9f86435620da
+  metadata.gz: 17c37db68c0bd400f252a05376c97844c89287a062c0dc26ceb4e8b4fc53fe62
+  data.tar.gz: 9fd668c694f127adfe07bceb74765785d913bb65413b93330e6870e8ce8761ee
 SHA512:
-  metadata.gz: 9104a9562a75872c26780e711f2744c7717c1349901ad89e661ea08cf444b00de5fa344c314c9cfc082b12e3e9a8247553af1c225a21f2f85a75924a1136b432
-  data.tar.gz: 4ce0eb72f3e26fde3aee41175771f83718d8dc2c4818fef1bcd6eaa47ae54d7f26d40d19df39ee449acdd2da0516a82ae552acb3c3ddfd90d224b4e41c49a50b
+  metadata.gz: 4b594ea96f955f07ad380ec021a6b330eb4ec569d92b9dc44897bdc46603431057db81c2091cefddab50d5d6ed1b12ad9cafd13be5fca20627bcaeb7f481cc15
+  data.tar.gz: 5b1910e5db2280d5e74a93ec7709c5ee7972ad1328b5de01c2c542f4c4c02b2e03bdfeeefd5ffd253078f8c65e4acc756d1ae606c116a1ba13d4f4f46ac67752

checksums.yaml.gz.sig

@@ -1,3 +1,4 @@
-)S��N�7H����øl����������#�m�?�X��}�|'0%
77��$�3��:�
-<�J&N�[(�y)���A����N��r���G*�9�3���K����0��5��s�㜅1���v�B�����t�Ķ7�ߵ(��Z��� A�8�HE���D����W��f�(���7F�{)1mVD]����]
-9*C��
+6��h';������Y=��Qb�	W5}X�я�iL|T�1��
lb�Q��W1�
+¼�{��]�jV�6
+!c�%���R�y���7�-?���Qh�ܒ��i�����t�J`�����h�es1߫o7v�B�I��D����m�)���&h��Q���j�CG��iӌ>�DuE����
+�`\

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 Nothing so far
 
+## 1.4.2
+
+#### Changes
+* Fix 00:00 vs. 24:00 calculation for times with time zones
+
+## 1.4.1
+
+#### Changes
+* Update upstream OFMX schema
+
 ## 1.4.0
 
 #### Additions

data/lib/aixm/schedule/time.rb

@@ -29,7 +29,7 @@ module AIXM
 
       EVENTS = { sunrise: :up, sunset: :down }.freeze
       PRECEDENCES = { first: :min, last: :max }.freeze
-      DATELESS_DATE = ::Date.parse('0000-01-01').freeze
+      DATELESS_DATE = ::Date.parse('0001-01-01').freeze
 
       # @api private
       attr_accessor :time
@@ -250,10 +250,15 @@ module AIXM
       # @param hour [Integer, String]
       # @param min [Integer, String]
       # @param offset [Integer, String] either UTC offset in seconds
-      #   (default: 0) or 'UTC'
+      #   (default: 0), as '+01:00', '-0300' or 'UTC'
       # @return [Time]
       def set_time(hour, min, offset)
-        @time = ::Time.new(DATELESS_DATE.year, DATELESS_DATE.month, DATELESS_DATE.day, hour, min, 0, offset || 0).utc
+# TODO: Colon-workaround can be removed when support of Ruby 3.0 has ended
+        coloned_offset = offset.is_a?(String) ? offset.sub(/([+-]\d{2})(\d{2})/, '\1:\2') : offset
+        utc = ::Time.new(1, 1, 1, hour, min, 0, coloned_offset || 0).utc
+#       utc = ::Time.new(1, 1, 1, hour, min, 0, offset || 0).utc
+        day_shift = utc.hour.zero? && utc.min.zero? && hour.to_i >= 12 ? 1 : 0
+        @time = ::Time.utc(DATELESS_DATE.year, DATELESS_DATE.month, DATELESS_DATE.day + day_shift, utc.hour, utc.min, 0)
       end
 
       def event=(value)
@@ -267,7 +272,7 @@ module AIXM
       end
 
       def end_of_day?
-        @time.day > DATELESS_DATE.day
+        @time.day != DATELESS_DATE.day
       end
 
       # @note Necessary to use this class in Range.

data/lib/aixm/version.rb

@@ -1,3 +1,3 @@
 module AIXM
-  VERSION = "1.4.0".freeze
+  VERSION = "1.4.2".freeze
 end

data/schemas/ofmx/0.1/OFMX-Snapshot.xsd

@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   <xsd:attributeGroup name="Changes"/>
   <xsd:element name="OFMX-Snapshot">
     <xsd:complexType>
-      <xsd:choice maxOccurs="unbounded">
+      <xsd:choice maxOccurs="unbounded" minOccurs="0">
         <xsd:element name="Aas" type="AirspaceAssociationType"/>
         <xsd:element name="Abd" type="AirspaceBorderType"/>
         <xsd:element name="Acr" type="AirspaceCorridorType"/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aixm
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Sven Schwyn
@@ -29,7 +29,7 @@ cert_chain:
   kAyiRqgxF4dJviwtqI7mZIomWL63+kXLgjOjMe1SHxfIPo/0ji6+r1p4KYa7o41v
   fwIwU1MKlFBdsjkd
   -----END CERTIFICATE-----
-date: 2023-01-22 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -313,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.5
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: Builder for AIXM/OFMX aeronautical information