Fixed fragment queue.

JetBrains · Dec 26, 2019 · ffa57d6 · ffa57d6
1 parent 947f2fa
commit ffa57d6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/base/src/commonMain/kotlin/jetbrains/datalore/base/spatial/QuadKey.kt b/base/src/commonMain/kotlin/jetbrains/datalore/base/spatial/QuadKey.kt
@@ -41,7 +41,7 @@ fun <T, OutT> QuadKey<T>.projectRect(rect: Rect<OutT>): Rect<OutT> {
  return Rect(origin, dimension)
 }
 
-fun QuadKey<LonLat>.zoom() = ((length - 1) / 3 + 1) * 3
+fun QuadKey<LonLat>.zoom() = length
 
 fun <TypeT> QuadKey<TypeT>.computeOrigin(mapRect: Rect<TypeT>): Vec<TypeT> {
  return projectOrigin(mapRect)

diff --git a/livemap-demo/src/commonMain/kotlin/jetbrains/livemap/demo/DemoModelBase.kt b/livemap-demo/src/commonMain/kotlin/jetbrains/livemap/demo/DemoModelBase.kt
@@ -48,11 +48,11 @@ abstract class DemoModelBase(private val dimension: DoubleVector) {
  loopY = false
  }
 
- params(
- DevParams.DEBUG_GRID.key to true,
- DevParams.MICRO_TASK_EXECUTOR.key to "ui_thread",
- DevParams.PERF_STATS.key to true
- )
+// params(
+// DevParams.DEBUG_GRID.key to true,
+// DevParams.MICRO_TASK_EXECUTOR.key to "ui_thread",
+// DevParams.PERF_STATS.key to true
+// )
 
  mapLocationConsumer = { Clipboard.copy(LiveMapLocation.getLocationString(it)) }
  }

diff --git a/...commonMain/kotlin/jetbrains/livemap/entities/geocoding/MapLocationInitializationSystem.kt b/...commonMain/kotlin/jetbrains/livemap/entities/geocoding/MapLocationInitializationSystem.kt
@@ -58,7 +58,7 @@ class MapLocationInitializationSystem(
  .run(myViewport::calculateBoundingBox)
  .calculatePosition { zoom, coordinates ->
  myCamera.get<CameraComponent>().apply {
- this.zoom = floor(zoom)
+ //this.zoom = floor(zoom)
  this.position = coordinates
  }
 

diff --git a/livemap/src/commonMain/kotlin/jetbrains/livemap/entities/regions/Components.kt b/livemap/src/commonMain/kotlin/jetbrains/livemap/entities/regions/Components.kt
@@ -68,6 +68,10 @@ class EmptyFragmentsComponent : EcsComponent {
  }
 }
 
+class ExistingRegionsComponent : EcsComponent {
+ val existingRegions = HashSet<String>()
+}
+
 class ChangedFragmentsComponent : EcsComponent {
  private val myNewFragments = HashSet<FragmentKey>()
  private val myObsoleteFragments = HashSet<FragmentKey>()
@@ -114,7 +118,7 @@ class DownloadingFragmentsComponent : EcsComponent {
 
  fun reduceQueue(keys: Set<FragmentKey>) {
  for (key in keys) {
- queue[key.quadKey.zoom()]?.remove(key)
+ queue[key.zoom()]?.remove(key)
  }
  }
 

diff --git a/livemap/src/commonMain/kotlin/jetbrains/livemap/entities/regions/FragmentUpdateSystem.kt b/livemap/src/commonMain/kotlin/jetbrains/livemap/entities/regions/FragmentUpdateSystem.kt
@@ -27,15 +27,16 @@ class FragmentUpdateSystem(
  .addComponents {
  + ChangedFragmentsComponent()
  + EmptyFragmentsComponent()
+ + ExistingRegionsComponent()
  }
  }
 
  override fun updateImpl(context: LiveMapContext, dt: Double) {
  val cellStateComponent = getSingleton<CellStateComponent>()
  val changedFragmentsComponent = getSingleton<ChangedFragmentsComponent>()
  val emptyFragments = getSingleton<EmptyFragmentsComponent>()
+ val existingRegions = getSingleton<ExistingRegionsComponent>().existingRegions
 
- val quadsToAdd = cellStateComponent.quadsToAdd
  val quadsToRemove = cellStateComponent.quadsToRemove
 
  val fragmentsToAdd = ArrayList<FragmentKey>()
@@ -45,6 +46,12 @@ class FragmentUpdateSystem(
  val bbox = regionEntity.get<RegionBBoxComponent>().bbox
  val regionId = regionEntity.get<RegionIdComponent>().regionId
 
+ var quadsToAdd = cellStateComponent.quadsToAdd
+ if (!existingRegions.contains(regionId)) {
+ quadsToAdd = cellStateComponent.visibleQuads
+ existingRegions.add(regionId)
+ }
+
  for (quad in quadsToAdd) {
  if (!emptyFragments.contains(regionId, quad) && bbox.intersect(quad)) {
  fragmentsToAdd.add(FragmentKey(regionId, quad))

diff --git a/livemap/src/commonMain/kotlin/jetbrains/livemap/entities/regions/RegionEmitSystem.kt b/livemap/src/commonMain/kotlin/jetbrains/livemap/entities/regions/RegionEmitSystem.kt
@@ -18,7 +18,7 @@ class RegionEmitSystem(componentManager: EcsComponentManager) : LiveMapSystem(co
  private var myPendingZoom = -1
 
  override fun initImpl(context: LiveMapContext) {
- createEntity("emitted_regions").addComponent(EmittedRegionsComponent())
+ createEntity("emitted_regions").add(EmittedRegionsComponent())
  }
 
  override fun updateImpl(context: LiveMapContext, dt: Double) {