merge

Author: joshday

src/KML.jl

@@ -104,7 +104,7 @@ Base.getindex(f::Folder, i) = f.Features === nothing ? throw(BoundsError(f, i))
 function __init__()
     # Register error hints for KMZ support
     Base.Experimental.register_error_hint(IO._read_kmz_file_from_path_error_hinter, ErrorException)
-    
+
     # Only check for conflicts when not precompiling
     if !Base.generating_output()
         check_geometry_conflicts()
@@ -115,16 +115,16 @@ function check_geometry_conflicts()
     geometry_types = [:Point, :LineString, :LinearRing, :Polygon, :MultiGeometry]
     blocked_exports = Symbol[]
     conflicts_with = Set{Symbol}()
-    
+
     for geom_type in geometry_types
         if isdefined(Main, geom_type)
             main_type = getfield(Main, geom_type)
             kml_type = getfield(KML, geom_type)
-            
+
             # Check if Main's type is NOT KML's type
             if main_type !== kml_type && !isa(main_type, Module)
                 push!(blocked_exports, geom_type)
-                
+
                 # Try to identify source package
                 try
                     # For types, use parentmodule directly
@@ -148,13 +148,13 @@ function check_geometry_conflicts()
             end
         end
     end
-    
+
     if !isempty(blocked_exports)
         conflict_source = isempty(conflicts_with) ? "" : " (from $(join(collect(conflicts_with), ", ")))"
-        
+
         @warn """
         KML.jl exports were blocked by existing definitions$conflict_source: $(join(blocked_exports, ", "))
-        
+
         To use KML's geometry types:
         • Import KML first:
           using KML
@@ -166,15 +166,11 @@ function check_geometry_conflicts()
     end
 end
 
-<<<<<<< parsing_perf_enhancement
-end # module KML
-=======
-# Add this type-level implementation for GeoInterface v1.x 
+# Add this type-level implementation for GeoInterface v1.x
 GeoInterface.isgeometry(::Type{<:Geometry}) = true
 
-# Add the missing ncoord implementations for GeoInterface v1.x 
+# Add the missing ncoord implementations for GeoInterface v1.x
 GeoInterface.ncoord(::GeoInterface.LineStringTrait, ls::LineString) = 2
 GeoInterface.ncoord(::GeoInterface.LinearRingTrait, lr::LinearRing) = 2
 
 end #module
->>>>>>> main