replace echogrambuilder with echogrambuilder new

Author: peter-urban

python/meson.build

@@ -69,7 +69,6 @@ sources = [
   'themachinethatgoesping/pingprocessing/watercolumn/echograms/coordinate_system.py',
   'themachinethatgoesping/pingprocessing/watercolumn/echograms/echodata.py',
   'themachinethatgoesping/pingprocessing/watercolumn/echograms/echogrambuilder.py',
-  'themachinethatgoesping/pingprocessing/watercolumn/echograms/echogrambuilder_new.py',
   'themachinethatgoesping/pingprocessing/watercolumn/echograms/indexers.py',
   'themachinethatgoesping/pingprocessing/watercolumn/echograms/layers/__init__.py',
   'themachinethatgoesping/pingprocessing/watercolumn/echograms/layers/echolayer.py',

python/tests/watercolumn/echograms/test_combine_from_image.py

@@ -15,7 +15,7 @@
 from themachinethatgoesping.pingprocessing.watercolumn.echograms.backends.image_backend import (
     ImageBackend,
 )
-from themachinethatgoesping.pingprocessing.watercolumn.echograms.echogrambuilder_new import (
+from themachinethatgoesping.pingprocessing.watercolumn.echograms.echogrambuilder import (
     EchogramBuilder,
 )
 

python/themachinethatgoesping/pingprocessing/watercolumn/echograms/__init__.py

@@ -6,52 +6,12 @@
 
 # functions
 from .echodata import EchoData
-from .echogrambuilder import EchogramBuilder
 
 # backends (convenience exports)
 from .backends import EchogramDataBackend, PingDataBackend, ZarrDataBackend
 
 # New refactored classes
 from .coordinate_system import EchogramCoordinateSystem
-from .echogrambuilder_new import EchogramBuilder as EchogramBuilderNew
+from .echogrambuilder import EchogramBuilder
 from .indexers import EchogramImageRequest
 
-
-def is_new_builder(echogram) -> bool:
-    """Check if an echogram instance is the new EchogramBuilderNew with LayerManager.
-    
-    Args:
-        echogram: An EchogramBuilder or EchogramBuilderNew instance.
-        
-    Returns:
-        True if using EchogramBuilderNew (with LayerManager), False otherwise.
-    """
-    return hasattr(echogram, '_layer_manager')
-
-
-def is_refactored_builder(echogram) -> bool:
-    """Check if an echogram instance uses the refactored builder with separate coordinate system.
-    
-    Args:
-        echogram: An EchogramBuilder instance.
-        
-    Returns:
-        True if using EchogramBuilderRefactored (with separate coord_system), False otherwise.
-    """
-    return hasattr(echogram, '_coord_system')
-
-
-def has_layers(echogram) -> bool:
-    """Check if an echogram has any layers (works with both builder types).
-    
-    Args:
-        echogram: An EchogramBuilder or EchogramBuilderNew instance.
-        
-    Returns:
-        True if there are named layers or a main layer.
-    """
-    if is_new_builder(echogram):
-        return echogram._layer_manager.has_layers()
-    else:
-        return len(echogram.layers.keys())>0 or echogram.main_layer is not None
-