Commit173ab6d

committed

refactor(2019-day-03): support multiple ways of finding closest intersection

1 parent7a6c55b commit173ab6dCopy full SHA for 173ab6d

File tree

+21

-14

lines changed

+21

-14

lines changed

Lines changed: 21 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,26 +27,33 @@ const findWireIntersections = (wires) => {`
`27`	`27`	`return{x:parseInt(point.x),y:parseInt(point.y)}`
`28`	`28`	`})`
`29`	`29`
`30`		`-returnints.sort(isCloser)`
	`30`	`+returnints.sort(isCloser.manhattan)`
`31`	`31`	`}`
`32`	`32`
`33`		`-constisCloser=(intA,intB)=>{`
`34`		`-constorigin={x:0,y:0}`
`35`		`-intA.distance=distance(origin,intA)`
`36`		`-intB.distance=distance(origin,intB)`
`37`		`-if(intA.distance<intB.distance){`
`38`		`-return-1`
	`33`	`+constisCloser={`
	`34`	`+manhattan:(intA,intB)=>{`
	`35`	`+constorigin={x:0,y:0}`
	`36`	`+intA.distance=distance(origin,intA)`
	`37`	`+intB.distance=distance(origin,intB)`
	`38`	`+if(intA.distance<intB.distance){`
	`39`	`+return-1`
	`40`	`+}`
	`41`	`+if(intA.distance>intB.distance){`
	`42`	`+return1`
	`43`	`+}`
	`44`	`+if(intA.distance===intB.distance){`
	`45`	`+return0`
	`46`	`+}`
`39`	`47`	`}`
`40`		`-if(intA.distance>intB.distance){`
`41`		`-return1`
`42`		`-}`
`43`		`-if(intA.distance===intB.distance){`
`44`		`-return0`
	`48`	`+}`
`45`	`49`	`}`
`46`	`50`	`}`
`47`	`51`
`48`		`-constgetClosesetIntersection=(intersections)=>{`
`49`		`-intersections.sort(isCloser)`
	`52`	`+constgetClosesetIntersection=({`
	`53`	`+ intersections,`
	`54`	`+ method='manhattan'`
	`55`	`+})=>{`
	`56`	`+intersections.sort(isCloser[method])`
`50`	`57`
`51`	`58`	`// TODO: Remove workaround for bug in SVG intersection library`
`52`	`59`	`// https://github.com/bpmn-io/path-intersection/issues/10`

Comments

(0)